s3db.js 7.4.0 → 7.4.2

package/dist/s3db.iife.js

@@ -9641,7 +9641,13 @@ ${JSON.stringify(validation, null, 2)}`,
       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 = {
@@ -9678,6 +9684,28 @@ ${JSON.stringify(validation, null, 2)}`,
       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;
@@ -11155,6 +11183,14 @@ ${JSON.stringify(validation, null, 2)}`,
       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,
@@ -11210,7 +11246,7 @@ ${JSON.stringify(validation, null, 2)}`,
      */
     configureIdGenerator(customIdGenerator, idSize) {
       if (typeof customIdGenerator === "function") {
-        return customIdGenerator;
+        return () => String(customIdGenerator());
       }
       if (typeof customIdGenerator === "number" && customIdGenerator > 0) {
         return nanoid.customAlphabet(nanoid.urlAlphabet, customIdGenerator);
@@ -11220,6 +11256,19 @@ ${JSON.stringify(validation, null, 2)}`,
       }
       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)
      */
@@ -13268,7 +13317,7 @@ ${JSON.stringify(validation, null, 2)}`,
       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 = {};
@@ -13339,6 +13388,18 @@ ${JSON.stringify(validation, null, 2)}`,
         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,
@@ -13358,7 +13419,9 @@ ${JSON.stringify(validation, null, 2)}`,
             autoDecrypt: versionData.autoDecrypt !== void 0 ? versionData.autoDecrypt : true,
             hooks: versionData.hooks || {},
             versioningEnabled: this.versioningEnabled,
-            map: versionData.map
+            map: versionData.map,
+            idGenerator: restoredIdGenerator,
+            idSize: restoredIdSize
           });
         }
       }
@@ -13519,6 +13582,8 @@ ${JSON.stringify(validation, null, 2)}`,
               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
             }
           }