s3db.js 8.1.3 → 8.2.0

package/dist/s3db.es.js

@@ -1363,17 +1363,13 @@ class AuditPlugin extends plugin_class_default {
     const plugin = this;
     resource.deleteMany = async function(ids) {
       const objectsToDelete = [];
-      if (plugin.config.includeData) {
-        for (const id of ids) {
-          const [ok, err, fetched] = await try_fn_default(() => resource.get(id));
-          if (ok) {
-            objectsToDelete.push(fetched);
-          } else {
-            objectsToDelete.push({ id });
-          }
+      for (const id of ids) {
+        const [ok, err, fetched] = await try_fn_default(() => resource.get(id));
+        if (ok) {
+          objectsToDelete.push(fetched);
+        } else {
+          objectsToDelete.push({ id });
         }
-      } else {
-        objectsToDelete.push(...ids.map((id) => ({ id })));
       }
       const result = await originalDeleteMany(ids);
       for (const oldData of objectsToDelete) {
@@ -1478,18 +1474,37 @@ class AuditPlugin extends plugin_class_default {
   async getAuditLogs(options = {}) {
     if (!this.auditResource) return [];
     const { resourceName, operation, recordId, partition, startDate, endDate, limit = 100, offset = 0 } = 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, offset });
-    return result.items || [];
+    const hasFilters = resourceName || operation || recordId || partition || startDate || endDate;
+    let items = [];
+    if (hasFilters) {
+      const fetchSize = Math.min(1e4, Math.max(1e3, (limit + offset) * 20));
+      const result = await this.auditResource.list({ limit: fetchSize });
+      items = result || [];
+      if (resourceName) {
+        items = items.filter((log) => log.resourceName === resourceName);
+      }
+      if (operation) {
+        items = items.filter((log) => log.operation === operation);
+      }
+      if (recordId) {
+        items = items.filter((log) => log.recordId === recordId);
+      }
+      if (partition) {
+        items = items.filter((log) => log.partition === partition);
+      }
+      if (startDate || endDate) {
+        items = items.filter((log) => {
+          const timestamp = new Date(log.timestamp);
+          if (startDate && timestamp < new Date(startDate)) return false;
+          if (endDate && timestamp > new Date(endDate)) return false;
+          return true;
+        });
+      }
+      return items.slice(offset, offset + limit);
+    } else {
+      const result = await this.auditResource.page({ size: limit, offset });
+      return result.items || [];
+    }
   }
   async getRecordHistory(resourceName, recordId) {
     return await this.getAuditLogs({ resourceName, recordId });
@@ -13503,7 +13518,7 @@ class Database extends EventEmitter {
     this.id = idGenerator(7);
     this.version = "1";
     this.s3dbVersion = (() => {
-      const [ok, err, version] = try_fn_default(() => true ? "8.1.3" : "latest");
+      const [ok, err, version] = try_fn_default(() => true ? "8.2.0" : "latest");
       return ok ? version : "latest";
     })();
     this.resources = {};
@@ -13511,7 +13526,8 @@ class Database extends EventEmitter {
     this.options = options;
     this.verbose = options.verbose || false;
     this.parallelism = parseInt(options.parallelism + "") || 10;
-    this.plugins = {};
+    this.plugins = options.plugins || [];
+    this.pluginRegistry = {};
     this.pluginList = options.plugins || [];
     this.cache = options.cache;
     this.passphrase = options.passphrase || "secret";
@@ -13805,7 +13821,7 @@ class Database extends EventEmitter {
         await plugin.setup(db);
         if (plugin.afterSetup) await plugin.afterSetup();
         const pluginName = this._getPluginName(plugin);
-        this.plugins[pluginName] = plugin;
+        this.pluginRegistry[pluginName] = plugin;
       });
       await Promise.all(setupProms);
       const startProms = plugins.map(async (plugin) => {