@hdriel/aws-utils 1.3.2 → 1.3.4

package/dist/index.cjs

@@ -286,6 +286,7 @@ var import_client_s37 = require("@aws-sdk/client-s3");
 
 // src/aws/s3/s3-stream.ts
 var import_pathe2 = require("pathe");
+var import_mime_types = __toESM(require("mime-types"), 1);
 var import_stream = require("stream");
 var import_util = require("util");
 var import_buffer2 = require("buffer");
@@ -1666,14 +1667,20 @@ var S3Stream = class _S3Stream extends S3File {
           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);
+          const shouldIncludeCharSet = contentType.startsWith("text/") || contentType === "application/json" || contentType === "application/xml" || contentType === "application/javascript" || contentType === "application/xhtml+xml";
+          if (shouldIncludeCharSet) {
+            res.setHeader("Content-Type", `${contentType}; charset=utf-8`);
+            stream.setEncoding("utf8");
+          } else {
+            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 {
+          if (forDownloading === false || forDownloading === void 0 && canDisplayInline) {
             res.setHeader("Content-Disposition", `inline; filename="${encodeURIComponent(fileName)}"`);
+          } else {
+            res.setHeader("Content-Disposition", `attachment; filename="${encodeURIComponent(fileName)}"`);
           }
           const cachingAge = !_cachingAge || typeof _cachingAge === "number" ? _cachingAge : getTotalSeconds(_cachingAge);
           if (cachingAge) {
@@ -1901,7 +1908,10 @@ var S3Stream = class _S3Stream extends S3File {
         acl,
         s3: this.s3Client,
         bucket: this.bucket,
-        contentType: import_multer_s3.default.AUTO_CONTENT_TYPE,
+        contentType: function(_req, file, cb) {
+          const contentType = file.mimetype || import_mime_types.default.lookup(file.originalname) || "application/octet-stream";
+          cb(null, contentType);
+        },
         metadata: (req, file, cb) => __async(this, null, function* () {
           const originalName = decodeURIComponent(file.originalname);
           const baseMetadata = __spreadProps(__spreadValues({}, file), {

package/dist/index.js

@@ -246,6 +246,7 @@ import { ListObjectsV2Command as ListObjectsV2Command4 } from "@aws-sdk/client-s
 
 // src/aws/s3/s3-stream.ts
 import { basename as basename2, extname } from "pathe";
+import mime from "mime-types";
 import { pipeline } from "stream";
 import { promisify } from "util";
 import { Buffer as Buffer3 } from "buffer";
@@ -1654,14 +1655,20 @@ var S3Stream = class _S3Stream extends S3File {
           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);
+          const shouldIncludeCharSet = contentType.startsWith("text/") || contentType === "application/json" || contentType === "application/xml" || contentType === "application/javascript" || contentType === "application/xhtml+xml";
+          if (shouldIncludeCharSet) {
+            res.setHeader("Content-Type", `${contentType}; charset=utf-8`);
+            stream.setEncoding("utf8");
+          } else {
+            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 {
+          if (forDownloading === false || forDownloading === void 0 && canDisplayInline) {
             res.setHeader("Content-Disposition", `inline; filename="${encodeURIComponent(fileName)}"`);
+          } else {
+            res.setHeader("Content-Disposition", `attachment; filename="${encodeURIComponent(fileName)}"`);
           }
           const cachingAge = !_cachingAge || typeof _cachingAge === "number" ? _cachingAge : getTotalSeconds(_cachingAge);
           if (cachingAge) {
@@ -1889,7 +1896,10 @@ var S3Stream = class _S3Stream extends S3File {
         acl,
         s3: this.s3Client,
         bucket: this.bucket,
-        contentType: multerS3.AUTO_CONTENT_TYPE,
+        contentType: function(_req, file, cb) {
+          const contentType = file.mimetype || mime.lookup(file.originalname) || "application/octet-stream";
+          cb(null, contentType);
+        },
         metadata: (req, file, cb) => __async(this, null, function* () {
           const originalName = decodeURIComponent(file.originalname);
           const baseMetadata = __spreadProps(__spreadValues({}, file), {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hdriel/aws-utils",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "Simplified AWS SDK (v3) utilities for S3 (upload, download, streaming) with TypeScript support",
   "author": "Hadriel Benjo (https://github.com/hdriel)",
   "type": "module",
@@ -49,6 +49,7 @@
     "aws-crt": "1.27.3",
     "aws-lambda": "1.0.7",
     "bytes": "3.1.2",
+    "mime-types": "^3.0.1",
     "ms": "2.1.3",
     "multer": "2.0.2",
     "multer-s3": "3.0.1",
@@ -62,6 +63,7 @@
     "@types/aws-lambda": "8.10.153",
     "@types/bytes": "3.1.5",
     "@types/express": "5.0.3",
+    "@types/mime-types": "^3.0.1",
     "@types/ms": "2.1.0",
     "@types/multer": "2.0.0",
     "@types/multer-s3": "3.0.3",
@@ -69,8 +71,8 @@
     "express": "^5.1.0",
     "prettier": "^3.6.2",
     "ts-node": "^10.9.2",
-    "tsup": "^8.5.0",
     "tslint": "^6.1.3",
+    "tsup": "^8.5.0",
     "typescript": "^5.9.2"
   }
 }