@hdriel/aws-utils 1.2.2 → 1.2.4

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");
@@ -1412,7 +1421,7 @@ var S3Stream = class _S3Stream extends S3File {
     this.maxUploadFileSizeRestriction = maxUploadFileSizeRestriction;
     this.s3Limiter = concurrencyVideoLimit ? (0, import_p_limit.default)(concurrencyVideoLimit) : null;
   }
-  streamObjectFile(_0) {
+  getObjectFileStream(_0) {
     return __async(this, arguments, function* (fileKey, {
       Range,
       checkFileExists = true,
@@ -1632,7 +1641,7 @@ var S3Stream = class _S3Stream extends S3File {
             next(Error(`File not found: "${normalizedKey}"`));
             return;
           }
-          stream = yield this.streamObjectFile(normalizedKey, {
+          stream = yield this.getObjectFileStream(normalizedKey, {
             abortSignal: abort.signal,
             checkFileExists: false
           });
@@ -1642,9 +1651,9 @@ var S3Stream = class _S3Stream extends S3File {
             return;
           }
           const fileInfo = yield this.fileInfo(normalizedKey);
-          const fileName = filename || normalizedKey.split("/").pop() || "download";
           const contentType = fileInfo.ContentType || "application/octet-stream";
           const ext = (0, import_pathe2.extname)(fileKey).slice(1).toLowerCase();
+          const fileName = filename || normalizedKey.split("/").pop() || `${Date.now()}.${ext}`;
           const inlineTypes = ["text/", "image/", "application/pdf", "video/", "audio/"];
           const canDisplayInline = SUPPORTED_IFRAME_EXTENSIONS.includes(ext) || inlineTypes.some((type) => contentType.startsWith(type));
           res.setHeader("Content-Type", contentType);
@@ -1660,6 +1669,7 @@ var S3Stream = class _S3Stream extends S3File {
           if (cachingAge) {
             res.setHeader("Cache-Control", `public, max-age=${cachingAge}`);
           }
+          res.setHeader("Access-Control-Expose-Headers", "Content-Type, Content-Disposition, Content-Length");
           stream.on("error", (err) => {
             var _a3, _b2;
             (_a3 = this.logger) == null ? void 0 : _a3.warn(this.reqId, "Stream error", { fileKey: normalizedKey, error: err });
@@ -1734,7 +1744,7 @@ var S3Stream = class _S3Stream extends S3File {
             var _a3, _b2, _c2;
             try {
               if (abort.signal.aborted) return null;
-              const stream = yield this.streamObjectFile(fileKey2, { abortSignal: abort.signal });
+              const stream = yield this.getObjectFileStream(fileKey2, { abortSignal: abort.signal });
               if (!stream) {
                 (_a3 = this.logger) == null ? void 0 : _a3.warn(this.reqId, "File not found", { fileKey: fileKey2 });
                 return null;
@@ -1883,10 +1893,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.d.cts

@@ -283,7 +283,7 @@ declare class S3Stream extends S3File {
     private readonly maxUploadFileSizeRestriction;
     private readonly s3Limiter;
     constructor({ maxUploadFileSizeRestriction, concurrencyVideoLimit, ...props }: S3StreamProps);
-    protected streamObjectFile(fileKey: string, { Range, checkFileExists, abortSignal, }?: {
+    getObjectFileStream(fileKey: string, { Range, checkFileExists, abortSignal, }?: {
         Range?: string;
         checkFileExists?: boolean;
         abortSignal?: AbortSignal;

package/dist/index.d.ts

@@ -283,7 +283,7 @@ declare class S3Stream extends S3File {
     private readonly maxUploadFileSizeRestriction;
     private readonly s3Limiter;
     constructor({ maxUploadFileSizeRestriction, concurrencyVideoLimit, ...props }: S3StreamProps);
-    protected streamObjectFile(fileKey: string, { Range, checkFileExists, abortSignal, }?: {
+    getObjectFileStream(fileKey: string, { Range, checkFileExists, abortSignal, }?: {
         Range?: string;
         checkFileExists?: boolean;
         abortSignal?: AbortSignal;

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";
@@ -1400,7 +1409,7 @@ var S3Stream = class _S3Stream extends S3File {
     this.maxUploadFileSizeRestriction = maxUploadFileSizeRestriction;
     this.s3Limiter = concurrencyVideoLimit ? pLimit(concurrencyVideoLimit) : null;
   }
-  streamObjectFile(_0) {
+  getObjectFileStream(_0) {
     return __async(this, arguments, function* (fileKey, {
       Range,
       checkFileExists = true,
@@ -1620,7 +1629,7 @@ var S3Stream = class _S3Stream extends S3File {
             next(Error(`File not found: "${normalizedKey}"`));
             return;
           }
-          stream = yield this.streamObjectFile(normalizedKey, {
+          stream = yield this.getObjectFileStream(normalizedKey, {
             abortSignal: abort.signal,
             checkFileExists: false
           });
@@ -1630,9 +1639,9 @@ var S3Stream = class _S3Stream extends S3File {
             return;
           }
           const fileInfo = yield this.fileInfo(normalizedKey);
-          const fileName = filename || normalizedKey.split("/").pop() || "download";
           const contentType = fileInfo.ContentType || "application/octet-stream";
           const ext = extname(fileKey).slice(1).toLowerCase();
+          const fileName = filename || normalizedKey.split("/").pop() || `${Date.now()}.${ext}`;
           const inlineTypes = ["text/", "image/", "application/pdf", "video/", "audio/"];
           const canDisplayInline = SUPPORTED_IFRAME_EXTENSIONS.includes(ext) || inlineTypes.some((type) => contentType.startsWith(type));
           res.setHeader("Content-Type", contentType);
@@ -1648,6 +1657,7 @@ var S3Stream = class _S3Stream extends S3File {
           if (cachingAge) {
             res.setHeader("Cache-Control", `public, max-age=${cachingAge}`);
           }
+          res.setHeader("Access-Control-Expose-Headers", "Content-Type, Content-Disposition, Content-Length");
           stream.on("error", (err) => {
             var _a3, _b2;
             (_a3 = this.logger) == null ? void 0 : _a3.warn(this.reqId, "Stream error", { fileKey: normalizedKey, error: err });
@@ -1722,7 +1732,7 @@ var S3Stream = class _S3Stream extends S3File {
             var _a3, _b2, _c2;
             try {
               if (abort.signal.aborted) return null;
-              const stream = yield this.streamObjectFile(fileKey2, { abortSignal: abort.signal });
+              const stream = yield this.getObjectFileStream(fileKey2, { abortSignal: abort.signal });
               if (!stream) {
                 (_a3 = this.logger) == null ? void 0 : _a3.warn(this.reqId, "File not found", { fileKey: fileKey2 });
                 return null;
@@ -1871,10 +1881,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.4",
   "description": "Simplified AWS SDK (v3) utilities for S3 (upload, download, streaming) with TypeScript support",
   "author": "Hadriel Benjo (https://github.com/hdriel)",
   "type": "module",