s3db.js 13.2.2 → 13.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s3db.js",
-  "version": "13.2.2",
+  "version": "13.3.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/clients/memory-client.class.js

@@ -74,6 +74,7 @@ export class MemoryClient extends EventEmitter {
     const input = command.input || {};
 
     this.emit('cl:request', commandName, input);
+    this.emit('command.request', commandName, input);
 
     let response;
 
@@ -106,6 +107,7 @@ export class MemoryClient extends EventEmitter {
       }
 
       this.emit('cl:response', commandName, response, input);
+      this.emit('command.response', commandName, response, input);
       return response;
 
     } catch (error) {
@@ -479,14 +481,14 @@ export class MemoryClient extends EventEmitter {
       const result = await this.deleteObjects(keys);
       totalDeleted = result.Deleted.length;
 
-      this.emit('cl:DeleteAll', {
+      this.emit('deleteAll', {
         prefix,
         batch: totalDeleted,
         total: totalDeleted
       });
     }
 
-    this.emit('cl:DeleteAllComplete', {
+    this.emit('deleteAllComplete', {
       prefix,
       totalDeleted
     });
@@ -544,7 +546,7 @@ export class MemoryClient extends EventEmitter {
       }
     }
 
-    this.emit('cl:MoveAllObjects', { results, errors }, { prefixFrom, prefixTo });
+    this.emit('moveAllObjects', { results, errors });
 
     if (errors.length > 0) {
       const error = new Error('Some objects could not be moved');

package/src/database.class.js

@@ -1091,7 +1091,7 @@ export class Database extends EventEmitter {
       if (!existingVersionData || existingVersionData.hash !== newHash) {
         await this.uploadMetadataFile();
       }
-      this.emit("db:resource:updated", name);
+      this.emit("s3db.resourceUpdated", name);
       return existingResource;
     }
     const existingMetadata = this.savedMetadata?.resources?.[name];
@@ -1131,7 +1131,7 @@ export class Database extends EventEmitter {
     }
 
     await this.uploadMetadataFile();
-    this.emit("db:resource:created", name);
+    this.emit("s3db.resourceCreated", name);
     return resource;
   }
 
@@ -1239,6 +1239,9 @@ export class Database extends EventEmitter {
   }
 
   async disconnect() {
+    // Emit disconnected event BEFORE removing listeners (Fix #2)
+    await this.emit('disconnected', new Date());
+
     // Silently ignore all errors during disconnect
     await tryFn(async () => {
       // 1. Remove all listeners from all plugins
@@ -1427,7 +1430,7 @@ export class Database extends EventEmitter {
       const [ok, error] = await tryFn(() => hook({ database: this, ...context }));
       if (!ok) {
         // Emit error event
-        this.emit('db:hook-error', { event, error, context });
+        this.emit('hookError', { event, error, context });
 
         // In strict mode, throw on first error instead of continuing
         if (this.strictHooks) {

package/src/plugins/audit.plugin.js

@@ -65,7 +65,7 @@ export class AuditPlugin extends Plugin {
 
   setupResourceAuditing(resource) {
     // Insert
-    resource.on('insert', async (data) => {
+    resource.on('inserted', async (data) => {
       const partitionValues = this.config.includePartitions ? this.getPartitionValues(data, resource) : null;
       await this.logAudit({
         resourceName: resource.name,
@@ -79,7 +79,7 @@ export class AuditPlugin extends Plugin {
     });
 
     // Update
-    resource.on('update', async (data) => {
+    resource.on('updated', async (data) => {
       let oldData = data.$before;
       if (this.config.includeData && !oldData) {
         const [ok, err, fetched] = await tryFn(() => resource.get(data.id));
@@ -99,7 +99,7 @@ export class AuditPlugin extends Plugin {
     });
 
     // Delete
-    resource.on('delete', async (data) => {
+    resource.on('deleted', async (data) => {
       let oldData = data;
       if (this.config.includeData && !oldData) {
         const [ok, err, fetched] = await tryFn(() => resource.get(data.id));

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

@@ -35,14 +35,14 @@ export class Cache extends EventEmitter {
   async get(key) {
     this.validateKey(key);
     const data = await this._get(key);
-    this.emit("get", data);
+    this.emit("fetched", data);
     return data;
   }
 
   async del(key) {
     this.validateKey(key);
     const data = await this._del(key);
-    this.emit("delete", data);
+    this.emit("deleted", data);
     return data;
   }
 

package/src/plugins/costs.plugin.js

@@ -110,8 +110,9 @@ export class CostsPlugin extends Plugin {
 
   async onStart() {
     if (this.client) {
-      this.client.on("command.response", (name, response, input) => this.addRequest(name, this.map[name], response, input));
-      this.client.on("command.error", (name, response, input) => this.addRequest(name, this.map[name], response, input));
+      // Listen to cl:response only (fires for all operations, success or error)
+      // This prevents double-counting (cl:request + cl:response would count twice)
+      this.client.on("cl:response", (name, response, input) => this.addRequest(name, this.map[name], response, input));
     }
   }
 

package/src/plugins/replicator.plugin.js

@@ -252,15 +252,15 @@ export class ReplicatorPlugin extends Plugin {
 
     // Save handler references
     this.eventHandlers.set(resource.name, {
-      insert: insertHandler,
-      update: updateHandler,
-      delete: deleteHandler
+      inserted: insertHandler,
+      updated: updateHandler,
+      deleted: deleteHandler
     });
 
-    // Attach listeners
-    resource.on('insert', insertHandler);
-    resource.on('update', updateHandler);
-    resource.on('delete', deleteHandler);
+    // Attach listeners (use standardized past tense event names)
+    resource.on('inserted', insertHandler);
+    resource.on('updated', updateHandler);
+    resource.on('deleted', deleteHandler);
 
     this.eventListenersInstalled.add(resource.name);
   }
@@ -753,9 +753,9 @@ export class ReplicatorPlugin extends Plugin {
           const handlers = this.eventHandlers.get(resourceName);
 
           if (resource && handlers) {
-            resource.off('insert', handlers.insert);
-            resource.off('update', handlers.update);
-            resource.off('delete', handlers.delete);
+            resource.off('inserted', handlers.inserted);
+            resource.off('updated', handlers.updated);
+            resource.off('deleted', handlers.deleted);
           }
         }
       }

package/src/plugins/replicators/base-replicator.class.js

@@ -20,7 +20,7 @@ export class BaseReplicator extends EventEmitter {
    */
   async initialize(database) {
     this.database = database;
-    this.emit('initialized', { replicator: this.name });
+    this.emit('db:plugin:initialized', { replicator: this.name });
   }
 
   /**

package/src/plugins/replicators/bigquery-replicator.class.js

@@ -189,7 +189,7 @@ class BigqueryReplicator extends BaseReplicator {
       await this.syncSchemas(database);
     }
 
-    this.emit('initialized', {
+    this.emit('db:plugin:initialized', {
       replicator: this.name,
       projectId: this.projectId,
       datasetId: this.datasetId,
@@ -598,7 +598,7 @@ class BigqueryReplicator extends BaseReplicator {
         console.warn(`[BigqueryReplicator] Replication completed with errors for ${resourceName}:`, errors);
       }
 
-      this.emit('replicated', {
+      this.emit('plg:replicator:replicated', {
         replicator: this.name,
         resourceName,
         operation,
@@ -622,7 +622,7 @@ class BigqueryReplicator extends BaseReplicator {
     if (this.config.verbose) {
       console.warn(`[BigqueryReplicator] Replication failed for ${resourceName}: ${err.message}`);
     }
-    this.emit('replicator_error', {
+    this.emit('plg:replicator:error', {
       replicator: this.name,
       resourceName,
       operation,

package/src/plugins/replicators/planetscale-replicator.class.js

@@ -369,7 +369,7 @@ class PlanetScaleReplicator extends BaseReplicator {
 
     const success = errors.length === 0;
 
-    this.emit('replicated', {
+    this.emit('plg:replicator:replicated', {
       replicator: this.name,
       resourceName,
       operation,

package/src/plugins/replicators/postgres-replicator.class.js

@@ -180,7 +180,7 @@ class PostgresReplicator extends BaseReplicator {
       await this.syncSchemas(database);
     }
 
-    this.emit('initialized', {
+    this.emit('db:plugin:initialized', {
       replicator: this.name,
       database: this.database || 'postgres',
       resources: Object.keys(this.resources)
@@ -452,7 +452,7 @@ class PostgresReplicator extends BaseReplicator {
         console.warn(`[PostgresReplicator] Replication completed with errors for ${resourceName}:`, errors);
       }
       
-      this.emit('replicated', {
+      this.emit('plg:replicator:replicated', {
         replicator: this.name,
         resourceName,
         operation,
@@ -473,7 +473,7 @@ class PostgresReplicator extends BaseReplicator {
     if (this.config.verbose) {
       console.warn(`[PostgresReplicator] Replication failed for ${resourceName}: ${err.message}`);
     }
-    this.emit('replicator_error', {
+    this.emit('plg:replicator:error', {
       replicator: this.name,
       resourceName,
       operation,

package/src/plugins/replicators/sqs-replicator.class.js

@@ -182,7 +182,7 @@ class SqsReplicator extends BaseReplicator {
         region: this.region,
         credentials: this.config.credentials
       });
-      this.emit('initialized', { 
+      this.emit('db:plugin:initialized', { 
         replicator: this.name, 
         queueUrl: this.queueUrl,
         queues: this.queues,
@@ -214,7 +214,7 @@ class SqsReplicator extends BaseReplicator {
         });
         const result = await this.sqsClient.send(command);
         results.push({ queueUrl, messageId: result.MessageId });
-        this.emit('replicated', {
+        this.emit('plg:replicator:replicated', {
           replicator: this.name,
           resource,
           operation,
@@ -230,7 +230,7 @@ class SqsReplicator extends BaseReplicator {
     if (this.config.verbose) {
       console.warn(`[SqsReplicator] Replication failed for ${resource}: ${err.message}`);
     }
-    this.emit('replicator_error', {
+    this.emit('plg:replicator:error', {
       replicator: this.name,
       resource,
       operation,

package/src/plugins/replicators/turso-replicator.class.js

@@ -374,7 +374,7 @@ class TursoReplicator extends BaseReplicator {
 
     const success = errors.length === 0;
 
-    this.emit('replicated', {
+    this.emit('plg:replicator:replicated', {
       replicator: this.name,
       resourceName,
       operation,

package/src/plugins/replicators/webhook-replicator.class.js

@@ -399,7 +399,7 @@ class WebhookReplicator extends BaseReplicator {
       throw error;
     }
 
-    this.emit('initialized', {
+    this.emit('db:plugin:initialized', {
       replicator: this.name,
       url: this.url,
       method: this.method,
@@ -428,7 +428,7 @@ class WebhookReplicator extends BaseReplicator {
       const response = await this._makeRequest(payload);
 
       if (response.success) {
-        this.emit('replicated', {
+        this.emit('plg:replicator:replicated', {
           replicator: this.name,
           resource,
           operation,
@@ -450,7 +450,7 @@ class WebhookReplicator extends BaseReplicator {
       console.warn(`[WebhookReplicator] Replication failed for ${resource}: ${err.message}`);
     }
 
-    this.emit('replicator_error', {
+    this.emit('plg:replicator:error', {
       replicator: this.name,
       resource,
       operation,

package/src/plugins/s3-queue.plugin.js

@@ -195,7 +195,7 @@ export class S3QueuePlugin extends Plugin {
 
       await plugin.queueResource.insert(queueEntry);
 
-      plugin.emit('message.enqueued', { id: record.id, queueId: queueEntry.id });
+      plugin.emit('plg:s3-queue:message-enqueued', { id: record.id, queueId: queueEntry.id });
 
       return record;
     };