s3db.js 8.1.1 → 8.2.0

package/mcp/server.js

@@ -4,7 +4,8 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js';
 import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js';
-import { S3db, CachePlugin, CostsPlugin, FilesystemCache } from 's3db.js';
+import { S3db, CachePlugin, CostsPlugin } from '../dist/s3db.es.js';
+import { FilesystemCache } from '../src/plugins/cache/filesystem-cache.class.js';
 import { config } from 'dotenv';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s3db.js",
-  "version": "8.1.1",
+  "version": "8.2.0",
   "description": "Use AWS S3, the world's most reliable document storage, as a database with this ORM.",
   "main": "dist/s3db.cjs.js",
   "module": "dist/s3db.es.js",
@@ -11,6 +11,8 @@
   "author": "@stone/martech",
   "license": "UNLICENSED",
   "bin": {
+    "s3db.js": "./bin/cli.js",
+    "s3db": "./bin/cli.js",
     "s3db-mcp": "./mcp/server.js"
   },
   "repository": {
@@ -51,8 +53,11 @@
   ],
   "dependencies": {
     "@aws-sdk/client-s3": "^3.850.0",
+    "@modelcontextprotocol/sdk": "^1.17.3",
     "@smithy/node-http-handler": "^4.1.0",
     "@supercharge/promise-pool": "^3.2.0",
+    "commander": "^12.1.0",
+    "dotenv": "^17.2.1",
     "fastest-validator": "^1.19.1",
     "flat": "^6.0.1",
     "json-stable-stringify": "^1.3.0",
@@ -90,7 +95,6 @@
     "@rollup/plugin-replace": "^6.0.2",
     "@rollup/plugin-terser": "^0.4.4",
     "@types/node": "24.1.0",
-    "dotenv": "^17.2.1",
     "jest": "^30.0.5",
     "rollup": "^4.46.1",
     "rollup-plugin-copy": "^3.5.0",

package/src/database.class.js

@@ -28,7 +28,8 @@ export class Database extends EventEmitter {
     this.options = options;
     this.verbose = options.verbose || false;
     this.parallelism = parseInt(options.parallelism + "") || 10;
-    this.plugins = options.plugins || []; // Initialize plugins array
+    this.plugins = options.plugins || []; // Keep the original array for backward compatibility
+    this.pluginRegistry = {}; // Initialize plugins registry as separate object
     this.pluginList = options.plugins || []; // Keep the list for backward compatibility
     this.cache = options.cache;
     this.passphrase = options.passphrase || "secret";
@@ -390,9 +391,13 @@ export class Database extends EventEmitter {
 
       const setupProms = plugins.map(async (plugin) => {
         if (plugin.beforeSetup) await plugin.beforeSetup()
-          await plugin.setup(db)
+        await plugin.setup(db)
         if (plugin.afterSetup) await plugin.afterSetup()
-        });
+        
+        // Register the plugin using the same naming convention as usePlugin()
+        const pluginName = this._getPluginName(plugin);
+        this.pluginRegistry[pluginName] = plugin;
+      });
       
       await Promise.all(setupProms);
 
@@ -411,8 +416,16 @@ export class Database extends EventEmitter {
    * @param {Plugin} plugin - Plugin instance to register
    * @param {string} [name] - Optional name for the plugin (defaults to plugin.constructor.name)
    */
+  /**
+   * Get the normalized plugin name
+   * @private
+   */
+  _getPluginName(plugin, customName = null) {
+    return customName || plugin.constructor.name.replace('Plugin', '').toLowerCase();
+  }
+
   async usePlugin(plugin, name = null) {
-    const pluginName = name || plugin.constructor.name.replace('Plugin', '').toLowerCase();
+    const pluginName = this._getPluginName(plugin, name);
     
     // Register the plugin
     this.plugins[pluginName] = plugin;

package/src/plugins/audit.plugin.js

@@ -119,17 +119,13 @@ export class AuditPlugin extends Plugin {
     resource.deleteMany = async function(ids) {
       // Fetch all objects before deletion for audit logging
       const objectsToDelete = [];
-      if (plugin.config.includeData) {
-        for (const id of ids) {
-          const [ok, err, fetched] = await tryFn(() => resource.get(id));
-          if (ok) {
-            objectsToDelete.push(fetched);
-          } else {
-            objectsToDelete.push({ id }); // Just store the ID if we can't fetch
-          }
+      for (const id of ids) {
+        const [ok, err, fetched] = await tryFn(() => resource.get(id));
+        if (ok) {
+          objectsToDelete.push(fetched);
+        } else {
+          objectsToDelete.push({ id }); // Just store the ID if we can't fetch
         }
-      } else {
-        objectsToDelete.push(...ids.map(id => ({ id })));
       }
       
       // Perform the actual deletion
@@ -260,21 +256,46 @@ export class AuditPlugin extends Plugin {
     
     const { resourceName, operation, recordId, partition, startDate, endDate, limit = 100, offset = 0 } = options;
     
-    let query = {};
+    // If we have specific filters, we need to fetch more items to ensure proper pagination after filtering
+    const hasFilters = resourceName || operation || recordId || partition || startDate || endDate;
     
-    if (resourceName) query.resourceName = resourceName;
-    if (operation) query.operation = operation;
-    if (recordId) query.recordId = recordId;
-    if (partition) query.partition = partition;
+    let items = [];
     
-    if (startDate || endDate) {
-      query.timestamp = {};
-      if (startDate) query.timestamp.$gte = startDate;
-      if (endDate) query.timestamp.$lte = endDate;
+    if (hasFilters) {
+      // Fetch enough items to handle filtering
+      const fetchSize = Math.min(10000, Math.max(1000, (limit + offset) * 20));
+      const result = await this.auditResource.list({ limit: fetchSize });
+      items = result || [];
+      
+      // Apply filters
+      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;
+        });
+      }
+      
+      // Apply offset and limit after filtering
+      return items.slice(offset, offset + limit);
+    } else {
+      // No filters, use direct pagination
+      const result = await this.auditResource.page({ size: limit, offset });
+      return result.items || [];
     }
-    
-    const result = await this.auditResource.page({ query, limit, offset });
-    return result.items || [];
   }
 
   async getRecordHistory(resourceName, recordId) {