s3db.js 7.3.10 → 7.4.1

package/package.json

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

@@ -103,7 +103,17 @@ export class Client extends EventEmitter {
       for (const [k, v] of Object.entries(metadata)) {
         // Ensure key is a valid string and value is a string
         const validKey = String(k).replace(/[^a-zA-Z0-9\-_]/g, '_');
-        stringMetadata[validKey] = String(v);
+        const stringValue = String(v);
+        
+        // Check if value contains non-ASCII characters that might be corrupted by HTTP headers
+        const hasSpecialChars = /[^\x00-\x7F]/.test(stringValue);
+        
+        if (hasSpecialChars) {
+          // Encode as base64 without prefix - we'll detect it intelligently on read
+          stringMetadata[validKey] = Buffer.from(stringValue, 'utf8').toString('base64');
+        } else {
+          stringMetadata[validKey] = stringValue;
+        }
       }
     }
     
@@ -141,9 +151,39 @@ export class Client extends EventEmitter {
       Bucket: this.config.bucket,
       Key: keyPrefix ? path.join(keyPrefix, key) : key,
     };
+ 
     let response, error;
     try {
       response = await this.sendCommand(new GetObjectCommand(options));
+      
+      // Smart decode: try to detect base64-encoded UTF-8 values without prefix
+      if (response.Metadata) {
+        const decodedMetadata = {};
+        for (const [key, value] of Object.entries(response.Metadata)) {
+          if (typeof value === 'string') {
+            // Try to decode as base64 and check if it's valid UTF-8 with special chars
+            try {
+              const decoded = Buffer.from(value, 'base64').toString('utf8');
+              // Check if decoded string is different from original and contains non-ASCII chars
+              const hasSpecialChars = /[^\x00-\x7F]/.test(decoded);
+              const isValidBase64 = Buffer.from(decoded, 'utf8').toString('base64') === value;
+              
+              if (isValidBase64 && hasSpecialChars && decoded !== value) {
+                decodedMetadata[key] = decoded;
+              } else {
+                decodedMetadata[key] = value;
+              }
+            } catch (decodeError) {
+              // If decode fails, use original value
+              decodedMetadata[key] = value;
+            }
+          } else {
+            decodedMetadata[key] = value;
+          }
+        }
+        response.Metadata = decodedMetadata;
+      }
+      
       return response;
     } catch (err) {
       error = err;

package/src/database.class.js

@@ -471,7 +471,8 @@ export class Database extends EventEmitter {
       versioningEnabled: this.versioningEnabled,
       map: config.map,
       idGenerator: config.idGenerator,
-      idSize: config.idSize
+      idSize: config.idSize,
+      events: config.events || {}
     });
     resource.database = this;
     this.resources[name] = resource;

package/src/resource.class.js

@@ -40,6 +40,7 @@ export class Resource extends EventEmitter {
    * @param {Function} [config.idGenerator] - Custom ID generator function
    * @param {number} [config.idSize=22] - Size for auto-generated IDs
    * @param {boolean} [config.versioningEnabled=false] - Enable versioning for this resource
+   * @param {Object} [config.events={}] - Event listeners to automatically add
    * @example
    * const users = new Resource({
    *   name: 'users',
@@ -61,6 +62,14 @@ export class Resource extends EventEmitter {
    *     beforeInsert: [async (data) => {
       *       return data;
    *     }]
+   *   },
+   *   events: {
+   *     insert: (ev) => console.log('Inserted:', ev.id),
+   *     update: [
+   *       (ev) => console.warn('Update detected'),
+   *       (ev) => console.log('Updated:', ev.id)
+   *     ],
+   *     delete: (ev) => console.log('Deleted:', ev.id)
    *   }
    * });
    * 
@@ -117,7 +126,8 @@ export class Resource extends EventEmitter {
       hooks = {},
       idGenerator: customIdGenerator,
       idSize = 22,
-      versioningEnabled = false
+      versioningEnabled = false,
+      events = {}
     } = config;
 
     // Set instance properties
@@ -177,6 +187,23 @@ export class Resource extends EventEmitter {
       }
     }
 
+    // Setup event listeners
+    if (events && Object.keys(events).length > 0) {
+      for (const [eventName, listeners] of Object.entries(events)) {
+        if (Array.isArray(listeners)) {
+          // Multiple listeners for this event
+          for (const listener of listeners) {
+            if (typeof listener === 'function') {
+              this.on(eventName, listener);
+            }
+          }
+        } else if (typeof listeners === 'function') {
+          // Single listener for this event
+          this.on(eventName, listeners);
+        }
+      }
+    }
+
     // --- MIDDLEWARE SYSTEM ---
     this._initMiddleware();
     // Debug: print method names and typeof update at construction
@@ -2617,6 +2644,27 @@ function validateResourceConfig(config) {
     }
   }
 
+  // Validate events
+  if (config.events !== undefined) {
+    if (typeof config.events !== 'object' || Array.isArray(config.events)) {
+      errors.push("Resource 'events' must be an object");
+    } else {
+      for (const [eventName, listeners] of Object.entries(config.events)) {
+        if (Array.isArray(listeners)) {
+          // Multiple listeners for this event
+          for (let i = 0; i < listeners.length; i++) {
+            const listener = listeners[i];
+            if (typeof listener !== 'function') {
+              errors.push(`Resource 'events.${eventName}[${i}]' must be a function`);
+            }
+          }
+        } else if (typeof listeners !== 'function') {
+          errors.push(`Resource 'events.${eventName}' must be a function or array of functions`);
+        }
+      }
+    }
+  }
+
   return {
     isValid: errors.length === 0,
     errors

package/src/s3db.d.ts

@@ -47,6 +47,7 @@ declare module 's3db.js' {
     idSize?: number;
     versioningEnabled?: boolean;
     map?: any;
+    events?: EventListenerConfig;
   }
 
   /** Partition configuration */
@@ -65,6 +66,11 @@ declare module 's3db.js' {
     afterDelete?: Function[];
   }
 
+  /** Event listener configuration */
+  export interface EventListenerConfig {
+    [eventName: string]: Function | Function[];
+  }
+
   /** Query options */
   export interface QueryOptions {
     limit?: number;