s3db.js 7.4.1 → 7.5.0

package/mcp/server.js

@@ -747,7 +747,7 @@ class S3dbMCPServer {
         });
       } else {
         // Memory cache configuration (default)
-        cacheConfig.driverType = 'memory';
+        cacheConfig.driver = 'memory';
         cacheConfig.memoryOptions = {
           maxSize: cacheMaxSizeEnv,
           ttl: cacheTtlEnv,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s3db.js",
-  "version": "7.4.1",
+  "version": "7.5.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",

package/src/database.class.js

@@ -113,6 +113,23 @@ export class Database extends EventEmitter {
       
       if (versionData) {
         // Extract configuration from version data at root level
+        // Restore ID generator configuration
+        let restoredIdGenerator, restoredIdSize;
+        if (versionData.idGenerator !== undefined) {
+          if (versionData.idGenerator === 'custom_function') {
+            // Custom function was used but can't be restored - use default
+            restoredIdGenerator = undefined;
+            restoredIdSize = versionData.idSize || 22;
+          } else if (typeof versionData.idGenerator === 'number') {
+            // Size-based generator
+            restoredIdGenerator = versionData.idGenerator;
+            restoredIdSize = versionData.idSize || versionData.idGenerator;
+          }
+        } else {
+          // Legacy resource without saved ID config
+          restoredIdSize = versionData.idSize || 22;
+        }
+
         this.resources[name] = new Resource({
           name,
           client: this.client,
@@ -131,7 +148,9 @@ export class Database extends EventEmitter {
           autoDecrypt: versionData.autoDecrypt !== undefined ? versionData.autoDecrypt : true,
           hooks: versionData.hooks || {},
           versioningEnabled: this.versioningEnabled,
-          map: versionData.map
+          map: versionData.map,
+          idGenerator: restoredIdGenerator,
+          idSize: restoredIdSize
         });
       }
     }
@@ -334,6 +353,8 @@ export class Database extends EventEmitter {
             autoDecrypt: resource.config.autoDecrypt,
             cache: resource.config.cache,
             hooks: resource.config.hooks,
+            idSize: resource.idSize,
+            idGenerator: resource.idGeneratorType,
             createdAt: isNewVersion ? new Date().toISOString() : existingVersionData?.createdAt
           }
         }

package/src/plugins/cache.plugin.js

@@ -28,12 +28,12 @@ export class CachePlugin extends Plugin {
 
   async onSetup() {
     // Initialize cache driver
-    if (this.config.driver) {
-      // Use custom driver if provided
+    if (this.config.driver && typeof this.config.driver === 'object') {
+      // Use custom driver instance if provided
       this.driver = this.config.driver;
-    } else if (this.config.driverType === 'memory') {
+    } else if (this.config.driver === 'memory') {
       this.driver = new MemoryCache(this.config.memoryOptions || {});
-    } else if (this.config.driverType === 'filesystem') {
+    } else if (this.config.driver === 'filesystem') {
       // Use partition-aware filesystem cache if enabled
       if (this.config.partitionAware) {
         this.driver = new PartitionAwareFilesystemCache({

package/src/plugins/replicator.plugin.js

@@ -164,6 +164,13 @@ export class ReplicatorPlugin extends Plugin {
     return filtered;
   }
 
+  async getCompleteData(resource, data) {
+    // Always get the complete record from the resource to ensure we have all data
+    // This handles all behaviors: body-overflow, truncate-data, body-only, etc.
+    const [ok, err, completeRecord] = await tryFn(() => resource.get(data.id));
+    return ok ? completeRecord : data;
+  }
+
   installEventListeners(resource, database, plugin) {
     if (!resource || this.eventListenersInstalled.has(resource.name) || 
         resource.name === this.config.replicatorLogResource) {
@@ -186,8 +193,10 @@ export class ReplicatorPlugin extends Plugin {
 
     resource.on('update', async (data, beforeData) => {
       const [ok, error] = await tryFn(async () => {
-        const completeData = { ...data, updatedAt: new Date().toISOString() };
-        await plugin.processReplicatorEvent('update', resource.name, completeData.id, completeData, beforeData);
+        // For updates, we need to get the complete updated record, not just the changed fields
+        const completeData = await plugin.getCompleteData(resource, data);
+        const dataWithTimestamp = { ...completeData, updatedAt: new Date().toISOString() };
+        await plugin.processReplicatorEvent('update', resource.name, completeData.id, dataWithTimestamp, beforeData);
       });
       
       if (!ok) {
@@ -214,17 +223,6 @@ export class ReplicatorPlugin extends Plugin {
     this.eventListenersInstalled.add(resource.name);
   }
 
-  /**
-   * Get complete data by always fetching the full record from the resource
-   * This ensures we always have the complete data regardless of behavior or data size
-   */
-  async getCompleteData(resource, data) {
-    // Always get the complete record from the resource to ensure we have all data
-    // This handles all behaviors: body-overflow, truncate-data, body-only, etc.
-    const [ok, err, completeRecord] = await tryFn(() => resource.get(data.id));
-    return ok ? completeRecord : data;
-  }
-
   async setup(database) {
     this.database = database;
 
@@ -241,7 +239,7 @@ export class ReplicatorPlugin extends Plugin {
     }
 
     const [logOk, logError] = await tryFn(async () => {
-      if (this.config.replicatorLogResource) {
+      if (this.config.persistReplicatorLog) {
         const logRes = await database.createResource({
           name: this.config.replicatorLogResource,
           behavior: 'body-overflow',
@@ -271,6 +269,13 @@ export class ReplicatorPlugin extends Plugin {
 
     await this.uploadMetadataFile(database);
 
+    // Install event listeners for existing resources
+    for (const resourceName in database.resources) {
+      const resource = database.resources[resourceName];
+      this.installEventListeners(resource, database, this);
+    }
+
+    // Override createResource to install listeners for new resources
     const originalCreateResource = database.createResource.bind(database);
     database.createResource = async (config) => {
       const resource = await originalCreateResource(config);
@@ -279,11 +284,6 @@ export class ReplicatorPlugin extends Plugin {
       }
       return resource;
     };
-
-    for (const resourceName in database.resources) {
-      const resource = database.resources[resourceName];
-      this.installEventListeners(resource, database, this);
-    }
   }
 
   createReplicator(driver, config, resources, client) {

package/src/resource.class.js

@@ -142,6 +142,19 @@ export class Resource extends EventEmitter {
 
     // Configure ID generator
     this.idGenerator = this.configureIdGenerator(customIdGenerator, idSize);
+    
+    // Store ID configuration for persistence
+    // If customIdGenerator is a number, use it as idSize
+    // Otherwise, use the provided idSize or default to 22
+    if (typeof customIdGenerator === 'number' && customIdGenerator > 0) {
+      this.idSize = customIdGenerator;
+    } else if (typeof idSize === 'number' && idSize > 0) {
+      this.idSize = idSize;
+    } else {
+      this.idSize = 22;
+    }
+    
+    this.idGeneratorType = this.getIdGeneratorType(customIdGenerator, this.idSize);
 
     // Store configuration - all at root level
     this.config = {
@@ -220,9 +233,9 @@ export class Resource extends EventEmitter {
    * @private
    */
   configureIdGenerator(customIdGenerator, idSize) {
-    // If a custom function is provided, use it
+    // If a custom function is provided, wrap it to ensure string output
     if (typeof customIdGenerator === 'function') {
-      return customIdGenerator;
+      return () => String(customIdGenerator());
     }
     // If customIdGenerator is a number (size), create a generator with that size
     if (typeof customIdGenerator === 'number' && customIdGenerator > 0) {
@@ -236,6 +249,22 @@ export class Resource extends EventEmitter {
     return defaultIdGenerator;
   }
 
+  /**
+   * Get a serializable representation of the ID generator type
+   * @param {Function|number} customIdGenerator - Custom ID generator function or size
+   * @param {number} idSize - Size for auto-generated IDs
+   * @returns {string|number} Serializable ID generator type
+   * @private
+   */
+  getIdGeneratorType(customIdGenerator, idSize) {
+    // If a custom function is provided
+    if (typeof customIdGenerator === 'function') {
+      return 'custom_function';
+    }
+    // For number generators or default size, return the actual idSize
+    return idSize;
+  }
+
   /**
    * Get resource options (for backward compatibility with tests)
    */