s3db.js 7.4.0 → 7.4.2

package/dist/s3db.cjs.js

@@ -9654,7 +9654,13 @@ class Client extends EventEmitter {
     if (metadata) {
       for (const [k, v] of Object.entries(metadata)) {
         const validKey = String(k).replace(/[^a-zA-Z0-9\-_]/g, "_");
-        stringMetadata[validKey] = String(v);
+        const stringValue = String(v);
+        const hasSpecialChars = /[^\x00-\x7F]/.test(stringValue);
+        if (hasSpecialChars) {
+          stringMetadata[validKey] = Buffer.from(stringValue, "utf8").toString("base64");
+        } else {
+          stringMetadata[validKey] = stringValue;
+        }
       }
     }
     const options = {
@@ -9691,6 +9697,28 @@ class Client extends EventEmitter {
     let response, error;
     try {
       response = await this.sendCommand(new clientS3.GetObjectCommand(options));
+      if (response.Metadata) {
+        const decodedMetadata = {};
+        for (const [key2, value] of Object.entries(response.Metadata)) {
+          if (typeof value === "string") {
+            try {
+              const decoded = Buffer.from(value, "base64").toString("utf8");
+              const hasSpecialChars = /[^\x00-\x7F]/.test(decoded);
+              const isValidBase64 = Buffer.from(decoded, "utf8").toString("base64") === value;
+              if (isValidBase64 && hasSpecialChars && decoded !== value) {
+                decodedMetadata[key2] = decoded;
+              } else {
+                decodedMetadata[key2] = value;
+              }
+            } catch (decodeError) {
+              decodedMetadata[key2] = value;
+            }
+          } else {
+            decodedMetadata[key2] = value;
+          }
+        }
+        response.Metadata = decodedMetadata;
+      }
       return response;
     } catch (err) {
       error = err;
@@ -11168,6 +11196,14 @@ class Resource extends EventEmitter {
     this.passphrase = passphrase ?? "secret";
     this.versioningEnabled = versioningEnabled;
     this.idGenerator = this.configureIdGenerator(customIdGenerator, idSize);
+    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);
     this.config = {
       cache,
       hooks,
@@ -11223,7 +11259,7 @@ class Resource extends EventEmitter {
    */
   configureIdGenerator(customIdGenerator, idSize) {
     if (typeof customIdGenerator === "function") {
-      return customIdGenerator;
+      return () => String(customIdGenerator());
     }
     if (typeof customIdGenerator === "number" && customIdGenerator > 0) {
       return nanoid.customAlphabet(nanoid.urlAlphabet, customIdGenerator);
@@ -11233,6 +11269,19 @@ class Resource extends EventEmitter {
     }
     return idGenerator;
   }
+  /**
+   * 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 (typeof customIdGenerator === "function") {
+      return "custom_function";
+    }
+    return idSize;
+  }
   /**
    * Get resource options (for backward compatibility with tests)
    */
@@ -13281,7 +13330,7 @@ class Database extends EventEmitter {
     super();
     this.version = "1";
     this.s3dbVersion = (() => {
-      const [ok, err, version] = try_fn_default(() => true ? "7.3.10" : "latest");
+      const [ok, err, version] = try_fn_default(() => true ? "7.4.1" : "latest");
       return ok ? version : "latest";
     })();
     this.resources = {};
@@ -13352,6 +13401,18 @@ class Database extends EventEmitter {
       const currentVersion = resourceMetadata.currentVersion || "v0";
       const versionData = resourceMetadata.versions?.[currentVersion];
       if (versionData) {
+        let restoredIdGenerator, restoredIdSize;
+        if (versionData.idGenerator !== void 0) {
+          if (versionData.idGenerator === "custom_function") {
+            restoredIdGenerator = void 0;
+            restoredIdSize = versionData.idSize || 22;
+          } else if (typeof versionData.idGenerator === "number") {
+            restoredIdGenerator = versionData.idGenerator;
+            restoredIdSize = versionData.idSize || versionData.idGenerator;
+          }
+        } else {
+          restoredIdSize = versionData.idSize || 22;
+        }
         this.resources[name] = new resource_class_default({
           name,
           client: this.client,
@@ -13371,7 +13432,9 @@ class Database extends EventEmitter {
           autoDecrypt: versionData.autoDecrypt !== void 0 ? versionData.autoDecrypt : true,
           hooks: versionData.hooks || {},
           versioningEnabled: this.versioningEnabled,
-          map: versionData.map
+          map: versionData.map,
+          idGenerator: restoredIdGenerator,
+          idSize: restoredIdSize
         });
       }
     }
@@ -13532,6 +13595,8 @@ class Database extends EventEmitter {
             autoDecrypt: resource.config.autoDecrypt,
             cache: resource.config.cache,
             hooks: resource.config.hooks,
+            idSize: resource.idSize,
+            idGenerator: resource.idGeneratorType,
             createdAt: isNewVersion ? (/* @__PURE__ */ new Date()).toISOString() : existingVersionData?.createdAt
           }
         }