@hdriel/aws-utils 1.2.1 → 1.2.3

package/dist/index.cjs

@@ -89,7 +89,8 @@ __export(index_exports, {
   LambdaUtil: () => LambdaUtil,
   S3LocalstackUtil: () => S3LocalstackUtil,
   S3Util: () => S3Util,
-  SNSUtil: () => SNSUtil
+  SNSUtil: () => SNSUtil,
+  SUPPORTED_IFRAME_EXTENSIONS: () => SUPPORTED_IFRAME_EXTENSIONS
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -289,6 +290,91 @@ var ACLs = /* @__PURE__ */ ((ACLs2) => {
   ACLs2["publicReadWrite"] = "public-read-write";
   return ACLs2;
 })(ACLs || {});
+var SUPPORTED_IFRAME_EXTENSIONS = [
+  // Images
+  "jpg",
+  "jpeg",
+  "png",
+  "gif",
+  "bmp",
+  "webp",
+  "svg",
+  "ico",
+  "tif",
+  "tiff",
+  "heic",
+  "heif",
+  "raw",
+  "cr2",
+  "nef",
+  "arw",
+  // Videos
+  "mp4",
+  "avi",
+  "mov",
+  "wmv",
+  "flv",
+  "mkv",
+  "webm",
+  "mpeg",
+  "mpg",
+  "m4v",
+  "3gp",
+  "ogv",
+  "ts",
+  "mts",
+  "m2ts",
+  // Documents
+  "pdf",
+  // Text
+  "txt",
+  "csv",
+  "json",
+  "xml",
+  "md",
+  "log",
+  "yaml",
+  "yml",
+  "ini",
+  "conf",
+  "cfg",
+  // Code
+  "js",
+  "ts",
+  "jsx",
+  "tsx",
+  "py",
+  "java",
+  "c",
+  "cpp",
+  "h",
+  "cs",
+  "php",
+  "rb",
+  "go",
+  "rs",
+  "swift",
+  "kt",
+  "scala",
+  // Audio
+  "mp3",
+  "wav",
+  "ogg",
+  "flac",
+  "aac",
+  "m4a",
+  "wma",
+  "aiff",
+  "ape",
+  "opus",
+  // Web
+  "html",
+  "htm",
+  "css",
+  "scss",
+  "sass",
+  "less"
+];
 
 // src/utils/helpers.ts
 var import_bytes = __toESM(require("bytes"), 1);
@@ -335,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");
@@ -1238,7 +1333,7 @@ var S3Stream = class _S3Stream extends S3File {
       queryField = "file",
       paramsField = "file",
       headerField = "x-fileKey",
-      cachingAgeSeconds = "1y"
+      cachingAge: _cachingAge = "1y"
     } = {}) => {
       return (req, res, next) => __async(this, null, function* () {
         var _a2, _b, _c, _d, _e, _f, _g, _h;
@@ -1263,8 +1358,10 @@ var S3Stream = class _S3Stream extends S3File {
           const contentType = mimeTypeMap[ext] || "application/octet-stream";
           res.setHeader("Content-Type", contentType);
           res.setHeader("Content-Length", imageBuffer.length);
-          const cachingAge = !cachingAgeSeconds || typeof cachingAgeSeconds === "number" ? cachingAgeSeconds : getTotalSeconds(cachingAgeSeconds);
-          if (cachingAge) res.setHeader("Cache-Control", `public, max-age=${cachingAge}`);
+          const cachingAge = !_cachingAge || typeof _cachingAge === "number" ? _cachingAge : getTotalSeconds(_cachingAge);
+          if (cachingAge) {
+            res.setHeader("Cache-Control", `public, max-age=${cachingAge}`);
+          }
           res.status(200).send(imageBuffer);
         } catch (error) {
           (_h = this.logger) == null ? void 0 : _h.warn(req.id, "image fileKey not found", __spreadValues({
@@ -1274,19 +1371,20 @@ var S3Stream = class _S3Stream extends S3File {
         }
       });
     });
-    __publicField(this, "streamPdfFileCtrl", ({
+    __publicField(this, "streamBufferFileCtrl", ({
       fileKey: _fileKey,
+      filename: _filename,
       queryField = "file",
       paramsField = "file",
       headerField = "x-fileKey",
-      cachingAgeSeconds = "1y"
+      cachingAge: _cachingAge = "1h"
     } = {}) => {
       return (req, res, next) => __async(this, null, function* () {
         var _a2, _b, _c, _d, _e, _f, _g, _h;
         let fileKey = _fileKey || (((_a2 = req.params) == null ? void 0 : _a2[paramsField]) ? decodeURIComponent((_b = req.params) == null ? void 0 : _b[paramsField]) : void 0) || (((_c = req.query) == null ? void 0 : _c[queryField]) ? decodeURIComponent((_d = req.query) == null ? void 0 : _d[queryField]) : void 0) || (((_e = req.headers) == null ? void 0 : _e[headerField]) ? decodeURIComponent((_f = req.headers) == null ? void 0 : _f[headerField]) : void 0);
         if (!fileKey) {
-          (_g = this.logger) == null ? void 0 : _g.warn(req.id, "pdf fileKey is required");
-          next(Error("pdf fileKey is required"));
+          (_g = this.logger) == null ? void 0 : _g.warn(req.id, "iframe fileKey is required");
+          next(Error("iframe fileKey is required"));
           return;
         }
         try {
@@ -1303,12 +1401,14 @@ var S3Stream = class _S3Stream extends S3File {
             pptx: "application/vnd.openxmlformats-officedocument.presentationml.presentation"
           };
           const contentType = mimeTypeMap[ext] || "application/octet-stream";
-          const filename = (0, import_pathe2.basename)(fileKey);
+          const filename = _filename || (0, import_pathe2.basename)(fileKey);
           res.setHeader("Content-Type", contentType);
           res.setHeader("Content-Disposition", `inline; filename="${encodeURIComponent(filename)}"`);
-          res.setHeader("Content-Length", fileBuffer.length);
-          const cachingAge = !cachingAgeSeconds || typeof cachingAgeSeconds === "number" ? cachingAgeSeconds : getTotalSeconds(cachingAgeSeconds);
-          res.setHeader("Cache-Control", `public, max-age=${cachingAge}`);
+          res.setHeader("Content-Length", String(fileBuffer.length));
+          const cachingAge = !_cachingAge || typeof _cachingAge === "number" ? _cachingAge : getTotalSeconds(_cachingAge);
+          if (cachingAge) {
+            res.setHeader("Cache-Control", `public, max-age=${cachingAge}`);
+          }
           res.status(200).send(fileBuffer);
         } catch (error) {
           (_h = this.logger) == null ? void 0 : _h.warn(req.id, "pdf fileKey not found", __spreadValues({
@@ -1512,11 +1612,13 @@ var S3Stream = class _S3Stream extends S3File {
       forDownloading = false,
       paramsField = "file",
       queryField = "file",
-      headerField = "x-fileKey"
+      headerField = "x-fileKey",
+      streamMethod,
+      cachingAge: _cachingAge = "1h"
     } = {}) {
       return (req, res, next) => __async(this, null, function* () {
         var _a2, _b, _c, _d, _e, _f, _g, _h, _i;
-        let fileKey = _fileKey || (((_a2 = req.params) == null ? void 0 : _a2[paramsField]) ? (_b = req.params) == null ? void 0 : _b[paramsField] : void 0) || (((_c = req.query) == null ? void 0 : _c[queryField]) ? (_d = req.query) == null ? void 0 : _d[queryField] : void 0) || (((_e = req.headers) == null ? void 0 : _e[headerField]) ? decodeURIComponent((_f = req.headers) == null ? void 0 : _f[headerField]) : void 0);
+        const fileKey = _fileKey || (((_a2 = req.params) == null ? void 0 : _a2[paramsField]) ? (_b = req.params) == null ? void 0 : _b[paramsField] : void 0) || (((_c = req.query) == null ? void 0 : _c[queryField]) ? (_d = req.query) == null ? void 0 : _d[queryField] : void 0) || (((_e = req.headers) == null ? void 0 : _e[headerField]) ? decodeURIComponent((_f = req.headers) == null ? void 0 : _f[headerField]) : void 0);
         if (!fileKey || fileKey === "/") {
           (_g = this.logger) == null ? void 0 : _g.warn(req.id, "fileKey stream is required");
           next(Error("fileKey stream is required"));
@@ -1550,13 +1652,23 @@ var S3Stream = class _S3Stream extends S3File {
           }
           const fileInfo = yield this.fileInfo(normalizedKey);
           const fileName = filename || normalizedKey.split("/").pop() || "download";
-          res.setHeader("Content-Type", fileInfo.ContentType || "application/octet-stream");
-          if (forDownloading) {
-            res.setHeader("Content-Disposition", `attachment; filename="${encodeURIComponent(fileName)}"`);
-          }
+          const contentType = fileInfo.ContentType || "application/octet-stream";
+          const ext = (0, import_pathe2.extname)(fileKey).slice(1).toLowerCase();
+          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);
           if (fileInfo.ContentLength) {
             res.setHeader("Content-Length", String(fileInfo.ContentLength));
           }
+          if (forDownloading || !canDisplayInline) {
+            res.setHeader("Content-Disposition", `attachment; filename="${encodeURIComponent(fileName)}"`);
+          } else {
+            res.setHeader("Content-Disposition", `inline; filename="${encodeURIComponent(fileName)}"`);
+          }
+          const cachingAge = !_cachingAge || typeof _cachingAge === "number" ? _cachingAge : getTotalSeconds(_cachingAge);
+          if (cachingAge) {
+            res.setHeader("Cache-Control", `public, max-age=${cachingAge}`);
+          }
           stream.on("error", (err) => {
             var _a3, _b2;
             (_a3 = this.logger) == null ? void 0 : _a3.warn(this.reqId, "Stream error", { fileKey: normalizedKey, error: err });
@@ -1568,7 +1680,12 @@ var S3Stream = class _S3Stream extends S3File {
             (_a3 = stream == null ? void 0 : stream.destroy) == null ? void 0 : _a3.call(stream);
             req.off("close", onClose);
           });
-          yield pump(stream, res);
+          streamMethod || (streamMethod = canDisplayInline ? "pipe" : "pipeline");
+          if (streamMethod === "pipeline") {
+            yield pump(stream, res);
+          } else {
+            stream.pipe(res);
+          }
           req.off("close", onClose);
         } catch (error) {
           abort.abort();
@@ -1775,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);
         }),
@@ -1896,6 +2025,14 @@ var S3Stream = class _S3Stream extends S3File {
    * Middleware for uploading multiple files with different field names
    * Adds the uploaded files info to req.s3FilesByField
    */
+  /*
+  example
+  uploadFieldsFiles([
+      { name: 'cardPosterSrc', maxCount: 1 },
+      { name: 'sectionPosterSrc', maxCount: 1 },
+      { name: 'imageSrc', maxCount: 1 },
+  ]) as any,
+  */
   // uploadFieldsFiles(
   //     fields: Array<{ name: string; directory: string; maxCount?: number; options?: S3UploadOptions }>
   // ): RequestHandler {
@@ -2083,5 +2220,6 @@ var SNSUtil = class {
   LambdaUtil,
   S3LocalstackUtil,
   S3Util,
-  SNSUtil
+  SNSUtil,
+  SUPPORTED_IFRAME_EXTENSIONS
 });

package/dist/index.d.cts

@@ -76,6 +76,7 @@ declare enum ACLs {
     publicRead = "public-read",
     publicReadWrite = "public-read-write"
 }
+declare const SUPPORTED_IFRAME_EXTENSIONS: string[];
 
 interface ContentFile {
     Key: string;
@@ -311,27 +312,30 @@ declare class S3Stream extends S3File {
         headerField?: string;
         streamTimeoutMS?: number | undefined;
     }): Promise<(req: Request$1 & any, res: Response & any, next: NextFunction & any) => Promise<any>>;
-    streamImageFileCtrl: ({ fileKey: _fileKey, queryField, paramsField, headerField, cachingAgeSeconds, }?: {
+    streamImageFileCtrl: ({ fileKey: _fileKey, queryField, paramsField, headerField, cachingAge: _cachingAge, }?: {
         fileKey?: string;
         queryField?: string;
         paramsField?: string;
         headerField?: string;
-        cachingAgeSeconds?: null | number | StringValue;
+        cachingAge?: null | number | StringValue;
     }) => (req: Request$1 & any, res: Response & any, next: NextFunction & any) => Promise<void>;
-    streamPdfFileCtrl: ({ fileKey: _fileKey, queryField, paramsField, headerField, cachingAgeSeconds, }?: {
+    streamBufferFileCtrl: ({ fileKey: _fileKey, filename: _filename, queryField, paramsField, headerField, cachingAge: _cachingAge, }?: {
         fileKey?: string;
+        filename?: string;
         queryField?: string;
         paramsField?: string;
         headerField?: string;
-        cachingAgeSeconds?: null | number | StringValue;
+        cachingAge?: null | number | StringValue;
     }) => (req: Request$1 & any, res: Response & any, next: NextFunction & any) => Promise<void>;
-    streamFileCtrl({ fileKey: _fileKey, filename, forDownloading, paramsField, queryField, headerField, }?: {
+    streamFileCtrl({ fileKey: _fileKey, filename, forDownloading, paramsField, queryField, headerField, streamMethod, cachingAge: _cachingAge, }?: {
         fileKey?: string;
         filename?: string;
         forDownloading?: boolean;
         paramsField?: string;
         queryField?: string;
         headerField?: string;
+        cachingAge?: null | number | StringValue;
+        streamMethod?: 'pipe' | 'pipeline';
     }): Promise<(req: Request$1 & any, res: Response & any, next: NextFunction & any) => Promise<void>>;
     streamZipFileCtr({ fileKey: _fileKey, filename: _filename, queryField, paramsField, headerField, compressionLevel, }?: {
         filename?: string;
@@ -422,4 +426,4 @@ declare class AWSConfigSharingUtil {
     };
 }
 
-export { ACLs, AWSConfigSharingUtil, type BucketInfo, type FILE_EXT, type FILE_TYPE, IAMUtil, LambdaUtil, S3LocalstackUtil, S3Util, type S3UtilProps, SNSUtil, type TreeDirectoryItem, type TreeFileItem, type UploadedS3File };
+export { ACLs, AWSConfigSharingUtil, type BucketInfo, type FILE_EXT, type FILE_TYPE, IAMUtil, LambdaUtil, S3LocalstackUtil, S3Util, type S3UtilProps, SNSUtil, SUPPORTED_IFRAME_EXTENSIONS, type TreeDirectoryItem, type TreeFileItem, type UploadedS3File };

package/dist/index.d.ts

@@ -76,6 +76,7 @@ declare enum ACLs {
     publicRead = "public-read",
     publicReadWrite = "public-read-write"
 }
+declare const SUPPORTED_IFRAME_EXTENSIONS: string[];
 
 interface ContentFile {
     Key: string;
@@ -311,27 +312,30 @@ declare class S3Stream extends S3File {
         headerField?: string;
         streamTimeoutMS?: number | undefined;
     }): Promise<(req: Request$1 & any, res: Response & any, next: NextFunction & any) => Promise<any>>;
-    streamImageFileCtrl: ({ fileKey: _fileKey, queryField, paramsField, headerField, cachingAgeSeconds, }?: {
+    streamImageFileCtrl: ({ fileKey: _fileKey, queryField, paramsField, headerField, cachingAge: _cachingAge, }?: {
         fileKey?: string;
         queryField?: string;
         paramsField?: string;
         headerField?: string;
-        cachingAgeSeconds?: null | number | StringValue;
+        cachingAge?: null | number | StringValue;
     }) => (req: Request$1 & any, res: Response & any, next: NextFunction & any) => Promise<void>;
-    streamPdfFileCtrl: ({ fileKey: _fileKey, queryField, paramsField, headerField, cachingAgeSeconds, }?: {
+    streamBufferFileCtrl: ({ fileKey: _fileKey, filename: _filename, queryField, paramsField, headerField, cachingAge: _cachingAge, }?: {
         fileKey?: string;
+        filename?: string;
         queryField?: string;
         paramsField?: string;
         headerField?: string;
-        cachingAgeSeconds?: null | number | StringValue;
+        cachingAge?: null | number | StringValue;
     }) => (req: Request$1 & any, res: Response & any, next: NextFunction & any) => Promise<void>;
-    streamFileCtrl({ fileKey: _fileKey, filename, forDownloading, paramsField, queryField, headerField, }?: {
+    streamFileCtrl({ fileKey: _fileKey, filename, forDownloading, paramsField, queryField, headerField, streamMethod, cachingAge: _cachingAge, }?: {
         fileKey?: string;
         filename?: string;
         forDownloading?: boolean;
         paramsField?: string;
         queryField?: string;
         headerField?: string;
+        cachingAge?: null | number | StringValue;
+        streamMethod?: 'pipe' | 'pipeline';
     }): Promise<(req: Request$1 & any, res: Response & any, next: NextFunction & any) => Promise<void>>;
     streamZipFileCtr({ fileKey: _fileKey, filename: _filename, queryField, paramsField, headerField, compressionLevel, }?: {
         filename?: string;
@@ -422,4 +426,4 @@ declare class AWSConfigSharingUtil {
     };
 }
 
-export { ACLs, AWSConfigSharingUtil, type BucketInfo, type FILE_EXT, type FILE_TYPE, IAMUtil, LambdaUtil, S3LocalstackUtil, S3Util, type S3UtilProps, SNSUtil, type TreeDirectoryItem, type TreeFileItem, type UploadedS3File };
+export { ACLs, AWSConfigSharingUtil, type BucketInfo, type FILE_EXT, type FILE_TYPE, IAMUtil, LambdaUtil, S3LocalstackUtil, S3Util, type S3UtilProps, SNSUtil, SUPPORTED_IFRAME_EXTENSIONS, type TreeDirectoryItem, type TreeFileItem, type UploadedS3File };

package/dist/index.js

@@ -250,6 +250,91 @@ var ACLs = /* @__PURE__ */ ((ACLs2) => {
   ACLs2["publicReadWrite"] = "public-read-write";
   return ACLs2;
 })(ACLs || {});
+var SUPPORTED_IFRAME_EXTENSIONS = [
+  // Images
+  "jpg",
+  "jpeg",
+  "png",
+  "gif",
+  "bmp",
+  "webp",
+  "svg",
+  "ico",
+  "tif",
+  "tiff",
+  "heic",
+  "heif",
+  "raw",
+  "cr2",
+  "nef",
+  "arw",
+  // Videos
+  "mp4",
+  "avi",
+  "mov",
+  "wmv",
+  "flv",
+  "mkv",
+  "webm",
+  "mpeg",
+  "mpg",
+  "m4v",
+  "3gp",
+  "ogv",
+  "ts",
+  "mts",
+  "m2ts",
+  // Documents
+  "pdf",
+  // Text
+  "txt",
+  "csv",
+  "json",
+  "xml",
+  "md",
+  "log",
+  "yaml",
+  "yml",
+  "ini",
+  "conf",
+  "cfg",
+  // Code
+  "js",
+  "ts",
+  "jsx",
+  "tsx",
+  "py",
+  "java",
+  "c",
+  "cpp",
+  "h",
+  "cs",
+  "php",
+  "rb",
+  "go",
+  "rs",
+  "swift",
+  "kt",
+  "scala",
+  // Audio
+  "mp3",
+  "wav",
+  "ogg",
+  "flac",
+  "aac",
+  "m4a",
+  "wma",
+  "aiff",
+  "ape",
+  "opus",
+  // Web
+  "html",
+  "htm",
+  "css",
+  "scss",
+  "sass",
+  "less"
+];
 
 // src/utils/helpers.ts
 import bytes from "bytes";
@@ -296,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";
@@ -1227,7 +1321,7 @@ var S3Stream = class _S3Stream extends S3File {
       queryField = "file",
       paramsField = "file",
       headerField = "x-fileKey",
-      cachingAgeSeconds = "1y"
+      cachingAge: _cachingAge = "1y"
     } = {}) => {
       return (req, res, next) => __async(this, null, function* () {
         var _a2, _b, _c, _d, _e, _f, _g, _h;
@@ -1252,8 +1346,10 @@ var S3Stream = class _S3Stream extends S3File {
           const contentType = mimeTypeMap[ext] || "application/octet-stream";
           res.setHeader("Content-Type", contentType);
           res.setHeader("Content-Length", imageBuffer.length);
-          const cachingAge = !cachingAgeSeconds || typeof cachingAgeSeconds === "number" ? cachingAgeSeconds : getTotalSeconds(cachingAgeSeconds);
-          if (cachingAge) res.setHeader("Cache-Control", `public, max-age=${cachingAge}`);
+          const cachingAge = !_cachingAge || typeof _cachingAge === "number" ? _cachingAge : getTotalSeconds(_cachingAge);
+          if (cachingAge) {
+            res.setHeader("Cache-Control", `public, max-age=${cachingAge}`);
+          }
           res.status(200).send(imageBuffer);
         } catch (error) {
           (_h = this.logger) == null ? void 0 : _h.warn(req.id, "image fileKey not found", __spreadValues({
@@ -1263,19 +1359,20 @@ var S3Stream = class _S3Stream extends S3File {
         }
       });
     });
-    __publicField(this, "streamPdfFileCtrl", ({
+    __publicField(this, "streamBufferFileCtrl", ({
       fileKey: _fileKey,
+      filename: _filename,
       queryField = "file",
       paramsField = "file",
       headerField = "x-fileKey",
-      cachingAgeSeconds = "1y"
+      cachingAge: _cachingAge = "1h"
     } = {}) => {
       return (req, res, next) => __async(this, null, function* () {
         var _a2, _b, _c, _d, _e, _f, _g, _h;
         let fileKey = _fileKey || (((_a2 = req.params) == null ? void 0 : _a2[paramsField]) ? decodeURIComponent((_b = req.params) == null ? void 0 : _b[paramsField]) : void 0) || (((_c = req.query) == null ? void 0 : _c[queryField]) ? decodeURIComponent((_d = req.query) == null ? void 0 : _d[queryField]) : void 0) || (((_e = req.headers) == null ? void 0 : _e[headerField]) ? decodeURIComponent((_f = req.headers) == null ? void 0 : _f[headerField]) : void 0);
         if (!fileKey) {
-          (_g = this.logger) == null ? void 0 : _g.warn(req.id, "pdf fileKey is required");
-          next(Error("pdf fileKey is required"));
+          (_g = this.logger) == null ? void 0 : _g.warn(req.id, "iframe fileKey is required");
+          next(Error("iframe fileKey is required"));
           return;
         }
         try {
@@ -1292,12 +1389,14 @@ var S3Stream = class _S3Stream extends S3File {
             pptx: "application/vnd.openxmlformats-officedocument.presentationml.presentation"
           };
           const contentType = mimeTypeMap[ext] || "application/octet-stream";
-          const filename = basename2(fileKey);
+          const filename = _filename || basename2(fileKey);
           res.setHeader("Content-Type", contentType);
           res.setHeader("Content-Disposition", `inline; filename="${encodeURIComponent(filename)}"`);
-          res.setHeader("Content-Length", fileBuffer.length);
-          const cachingAge = !cachingAgeSeconds || typeof cachingAgeSeconds === "number" ? cachingAgeSeconds : getTotalSeconds(cachingAgeSeconds);
-          res.setHeader("Cache-Control", `public, max-age=${cachingAge}`);
+          res.setHeader("Content-Length", String(fileBuffer.length));
+          const cachingAge = !_cachingAge || typeof _cachingAge === "number" ? _cachingAge : getTotalSeconds(_cachingAge);
+          if (cachingAge) {
+            res.setHeader("Cache-Control", `public, max-age=${cachingAge}`);
+          }
           res.status(200).send(fileBuffer);
         } catch (error) {
           (_h = this.logger) == null ? void 0 : _h.warn(req.id, "pdf fileKey not found", __spreadValues({
@@ -1501,11 +1600,13 @@ var S3Stream = class _S3Stream extends S3File {
       forDownloading = false,
       paramsField = "file",
       queryField = "file",
-      headerField = "x-fileKey"
+      headerField = "x-fileKey",
+      streamMethod,
+      cachingAge: _cachingAge = "1h"
     } = {}) {
       return (req, res, next) => __async(this, null, function* () {
         var _a2, _b, _c, _d, _e, _f, _g, _h, _i;
-        let fileKey = _fileKey || (((_a2 = req.params) == null ? void 0 : _a2[paramsField]) ? (_b = req.params) == null ? void 0 : _b[paramsField] : void 0) || (((_c = req.query) == null ? void 0 : _c[queryField]) ? (_d = req.query) == null ? void 0 : _d[queryField] : void 0) || (((_e = req.headers) == null ? void 0 : _e[headerField]) ? decodeURIComponent((_f = req.headers) == null ? void 0 : _f[headerField]) : void 0);
+        const fileKey = _fileKey || (((_a2 = req.params) == null ? void 0 : _a2[paramsField]) ? (_b = req.params) == null ? void 0 : _b[paramsField] : void 0) || (((_c = req.query) == null ? void 0 : _c[queryField]) ? (_d = req.query) == null ? void 0 : _d[queryField] : void 0) || (((_e = req.headers) == null ? void 0 : _e[headerField]) ? decodeURIComponent((_f = req.headers) == null ? void 0 : _f[headerField]) : void 0);
         if (!fileKey || fileKey === "/") {
           (_g = this.logger) == null ? void 0 : _g.warn(req.id, "fileKey stream is required");
           next(Error("fileKey stream is required"));
@@ -1539,13 +1640,23 @@ var S3Stream = class _S3Stream extends S3File {
           }
           const fileInfo = yield this.fileInfo(normalizedKey);
           const fileName = filename || normalizedKey.split("/").pop() || "download";
-          res.setHeader("Content-Type", fileInfo.ContentType || "application/octet-stream");
-          if (forDownloading) {
-            res.setHeader("Content-Disposition", `attachment; filename="${encodeURIComponent(fileName)}"`);
-          }
+          const contentType = fileInfo.ContentType || "application/octet-stream";
+          const ext = extname(fileKey).slice(1).toLowerCase();
+          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);
           if (fileInfo.ContentLength) {
             res.setHeader("Content-Length", String(fileInfo.ContentLength));
           }
+          if (forDownloading || !canDisplayInline) {
+            res.setHeader("Content-Disposition", `attachment; filename="${encodeURIComponent(fileName)}"`);
+          } else {
+            res.setHeader("Content-Disposition", `inline; filename="${encodeURIComponent(fileName)}"`);
+          }
+          const cachingAge = !_cachingAge || typeof _cachingAge === "number" ? _cachingAge : getTotalSeconds(_cachingAge);
+          if (cachingAge) {
+            res.setHeader("Cache-Control", `public, max-age=${cachingAge}`);
+          }
           stream.on("error", (err) => {
             var _a3, _b2;
             (_a3 = this.logger) == null ? void 0 : _a3.warn(this.reqId, "Stream error", { fileKey: normalizedKey, error: err });
@@ -1557,7 +1668,12 @@ var S3Stream = class _S3Stream extends S3File {
             (_a3 = stream == null ? void 0 : stream.destroy) == null ? void 0 : _a3.call(stream);
             req.off("close", onClose);
           });
-          yield pump(stream, res);
+          streamMethod || (streamMethod = canDisplayInline ? "pipe" : "pipeline");
+          if (streamMethod === "pipeline") {
+            yield pump(stream, res);
+          } else {
+            stream.pipe(res);
+          }
           req.off("close", onClose);
         } catch (error) {
           abort.abort();
@@ -1764,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);
         }),
@@ -1885,6 +2013,14 @@ var S3Stream = class _S3Stream extends S3File {
    * Middleware for uploading multiple files with different field names
    * Adds the uploaded files info to req.s3FilesByField
    */
+  /*
+  example
+  uploadFieldsFiles([
+      { name: 'cardPosterSrc', maxCount: 1 },
+      { name: 'sectionPosterSrc', maxCount: 1 },
+      { name: 'imageSrc', maxCount: 1 },
+  ]) as any,
+  */
   // uploadFieldsFiles(
   //     fields: Array<{ name: string; directory: string; maxCount?: number; options?: S3UploadOptions }>
   // ): RequestHandler {
@@ -2071,5 +2207,6 @@ export {
   LambdaUtil,
   S3LocalstackUtil,
   S3Util,
-  SNSUtil
+  SNSUtil,
+  SUPPORTED_IFRAME_EXTENSIONS
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hdriel/aws-utils",
-  "version": "1.2.1",
+  "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",