@hdriel/aws-utils 1.2.2 → 1.2.3

package/dist/index.cjs

@@ -421,6 +421,15 @@ var getUnitBytes = (bytes2, unit) => {
       return bytes2;
   }
 };
+function hasNonAscii(str) {
+  return /[^\x00-\x7F]/.test(str);
+}
+function encodeS3Metadata(value) {
+  if (hasNonAscii(value)) {
+    return Buffer.from(value, "utf8").toString("base64");
+  }
+  return value;
+}
 
 // src/aws/s3/s3-file.ts
 var import_buffer = require("buffer");
@@ -1883,10 +1892,22 @@ var S3Stream = class _S3Stream extends S3File {
         bucket: this.bucket,
         contentType: import_multer_s3.default.AUTO_CONTENT_TYPE,
         metadata: (req, file, cb) => __async(this, null, function* () {
-          const baseMetadata = __spreadProps(__spreadValues({}, file), { directory: normalizedPath });
+          const originalName = decodeURIComponent(file.originalname);
+          const baseMetadata = __spreadProps(__spreadValues({}, file), {
+            directory: normalizedPath,
+            // Encode non-ASCII characters for S3 metadata
+            originalname: encodeS3Metadata(originalName),
+            // Optional: Add a flag to know it's encoded
+            // @ts-ignore
+            "originalname-encoded": hasNonAscii(originalName) ? "base64" : "plain"
+          });
           if (customMetadata) {
             const additionalMetadata = typeof customMetadata === "function" ? yield customMetadata(req, file) : customMetadata;
-            Object.assign(baseMetadata, additionalMetadata);
+            const sanitizedMetadata = {};
+            for (const [key, value] of Object.entries(additionalMetadata)) {
+              sanitizedMetadata[key] = typeof value === "string" ? encodeS3Metadata(value) : String(value);
+            }
+            Object.assign(baseMetadata, sanitizedMetadata);
           }
           cb(null, baseMetadata);
         }),

package/dist/index.js

@@ -381,6 +381,15 @@ var getUnitBytes = (bytes2, unit) => {
       return bytes2;
   }
 };
+function hasNonAscii(str) {
+  return /[^\x00-\x7F]/.test(str);
+}
+function encodeS3Metadata(value) {
+  if (hasNonAscii(value)) {
+    return Buffer.from(value, "utf8").toString("base64");
+  }
+  return value;
+}
 
 // src/aws/s3/s3-file.ts
 import { Buffer as Buffer2 } from "buffer";
@@ -1871,10 +1880,22 @@ var S3Stream = class _S3Stream extends S3File {
         bucket: this.bucket,
         contentType: multerS3.AUTO_CONTENT_TYPE,
         metadata: (req, file, cb) => __async(this, null, function* () {
-          const baseMetadata = __spreadProps(__spreadValues({}, file), { directory: normalizedPath });
+          const originalName = decodeURIComponent(file.originalname);
+          const baseMetadata = __spreadProps(__spreadValues({}, file), {
+            directory: normalizedPath,
+            // Encode non-ASCII characters for S3 metadata
+            originalname: encodeS3Metadata(originalName),
+            // Optional: Add a flag to know it's encoded
+            // @ts-ignore
+            "originalname-encoded": hasNonAscii(originalName) ? "base64" : "plain"
+          });
           if (customMetadata) {
             const additionalMetadata = typeof customMetadata === "function" ? yield customMetadata(req, file) : customMetadata;
-            Object.assign(baseMetadata, additionalMetadata);
+            const sanitizedMetadata = {};
+            for (const [key, value] of Object.entries(additionalMetadata)) {
+              sanitizedMetadata[key] = typeof value === "string" ? encodeS3Metadata(value) : String(value);
+            }
+            Object.assign(baseMetadata, sanitizedMetadata);
           }
           cb(null, baseMetadata);
         }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hdriel/aws-utils",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Simplified AWS SDK (v3) utilities for S3 (upload, download, streaming) with TypeScript support",
   "author": "Hadriel Benjo (https://github.com/hdriel)",
   "type": "module",