@hdriel/aws-utils 1.1.6 → 1.1.8

package/dist/index.cjs

@@ -271,7 +271,7 @@ var LambdaUtil = class {
 var import_client_s36 = require("@aws-sdk/client-s3");
 
 // src/aws/s3/s3-stream.ts
-var import_pathe2 = __toESM(require("pathe"), 1);
+var import_pathe2 = require("pathe");
 var import_stream = require("stream");
 var import_util = require("util");
 var import_buffer2 = require("buffer");
@@ -321,6 +321,23 @@ var getTotalSeconds = (msValue) => {
   const value = (0, import_ms.default)(msValue);
   return value / 1e3;
 };
+var getUnitBytes = (bytes2, unit) => {
+  switch (unit == null ? void 0 : unit.toUpperCase()) {
+    case "KB":
+      return bytes2 / 1024;
+    case "MB":
+      return bytes2 / __pow(1024, 2);
+    case "GB":
+      return bytes2 / __pow(1024, 3);
+    case "TB":
+      return bytes2 / __pow(1024, 4);
+    case "PB":
+      return bytes2 / __pow(1024, 5);
+    case "B":
+    default:
+      return bytes2;
+  }
+};
 
 // src/aws/s3/s3-file.ts
 var import_buffer = require("buffer");
@@ -681,7 +698,6 @@ var S3Directory = class extends S3Bucket {
   constructor(props) {
     super(props);
   }
-  // todo: checked!
   directoryExists(directoryPath) {
     return __async(this, null, function* () {
       var _a2;
@@ -699,7 +715,6 @@ var S3Directory = class extends S3Bucket {
       }
     });
   }
-  // todo: checked!
   createDirectory(directoryPath) {
     return __async(this, null, function* () {
       let normalizedPath = getNormalizedPath(directoryPath);
@@ -709,7 +724,6 @@ var S3Directory = class extends S3Bucket {
       return result;
     });
   }
-  // todo: checked!
   deleteDirectory(directoryPath) {
     return __async(this, null, function* () {
       var _a2, _b, _c, _d, _e, _f, _g;
@@ -779,7 +793,6 @@ var S3Directory = class extends S3Bucket {
       };
     });
   }
-  // todo: checked!
   directoryList(directoryPath) {
     return __async(this, null, function* () {
       var _a2;
@@ -836,7 +849,6 @@ var S3Directory = class extends S3Bucket {
       return { directories, files };
     });
   }
-  // todo: checked!
   directoryListPaginated(_0) {
     return __async(this, arguments, function* (directoryPath, {
       pageSize = 100,
@@ -955,9 +967,9 @@ var S3File = class extends S3Directory {
   constructor(props) {
     super(props);
   }
-  fileInfo(filePath) {
+  fileInfo(fileKey) {
     return __async(this, null, function* () {
-      const normalizedKey = getNormalizedPath(filePath);
+      const normalizedKey = getNormalizedPath(fileKey);
       if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
       const command = new import_client_s34.HeadObjectCommand({ Bucket: this.bucket, Key: normalizedKey });
       const result = yield this.execute(command);
@@ -996,7 +1008,6 @@ var S3File = class extends S3Directory {
       return files;
     });
   }
-  // todo: checked!
   fileListPaginated(_0) {
     return __async(this, arguments, function* (directoryPath, {
       fileNamePrefix,
@@ -1052,14 +1063,13 @@ var S3File = class extends S3Directory {
       };
     });
   }
-  // todo: checked!
-  taggingFile(filePath, tag) {
+  taggingFile(fileKey, tag) {
     return __async(this, null, function* () {
       var _a2;
       let normalizedKey = "";
       const tags = [].concat(tag);
       try {
-        normalizedKey = getNormalizedPath(filePath);
+        normalizedKey = getNormalizedPath(fileKey);
         if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
         const command = new import_client_s34.PutObjectTaggingCommand({
           Bucket: this.bucket,
@@ -1074,11 +1084,10 @@ var S3File = class extends S3Directory {
       }
     });
   }
-  // todo: checked!
-  fileVersion(filePath) {
+  fileVersion(fileKey) {
     return __async(this, null, function* () {
       var _a2, _b;
-      const normalizedKey = getNormalizedPath(filePath);
+      const normalizedKey = getNormalizedPath(fileKey);
       if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
       const command = new import_client_s34.GetObjectTaggingCommand({ Bucket: this.bucket, Key: normalizedKey });
       const result = yield this.execute(command);
@@ -1086,11 +1095,10 @@ var S3File = class extends S3Directory {
       return (_b = tag == null ? void 0 : tag.Value) != null ? _b : "";
     });
   }
-  // todo: checked!
-  fileUrl(filePath, expiresIn = "15m") {
+  fileUrl(fileKey, expiresIn = "15m") {
     return __async(this, null, function* () {
       var _a2;
-      let normalizedKey = getNormalizedPath(filePath);
+      let normalizedKey = getNormalizedPath(fileKey);
       if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
       const expiresInSeconds = typeof expiresIn === "number" ? expiresIn : (0, import_ms2.default)(expiresIn) / 1e3;
       const command = new import_client_s34.GetObjectCommand({ Bucket: this.bucket, Key: normalizedKey });
@@ -1098,44 +1106,34 @@ var S3File = class extends S3Directory {
         expiresIn: expiresInSeconds
         // is using 3600 it's will expire in 1 hour (default is 900 seconds = 15 minutes)
       });
-      (_a2 = this.logger) == null ? void 0 : _a2.info(null, "generate signed file url", { url, filePath: normalizedKey, expiresIn });
+      (_a2 = this.logger) == null ? void 0 : _a2.info(null, "generate signed file url", { url, fileKey: normalizedKey, expiresIn });
       return url;
     });
   }
-  sizeOf(filePath, unit = "bytes") {
+  sizeOf(fileKey, unit) {
     return __async(this, null, function* () {
       var _a2, _b, _c;
-      const normalizedKey = getNormalizedPath(filePath);
+      const normalizedKey = getNormalizedPath(fileKey);
       if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
       try {
         const command = new import_client_s34.HeadObjectCommand({ Bucket: this.bucket, Key: normalizedKey });
         const headObject = yield this.execute(command);
         const bytes2 = (_a2 = headObject.ContentLength) != null ? _a2 : 0;
-        switch (unit) {
-          case "KB":
-            return bytes2 / 1024;
-          case "MB":
-            return bytes2 / (1024 * 1024);
-          case "GB":
-            return bytes2 / (1024 * 1024 * 1024);
-          default:
-            return bytes2;
-        }
+        return getUnitBytes(bytes2, unit);
       } catch (error) {
         if (error.name === "NotFound" || ((_b = error.$metadata) == null ? void 0 : _b.httpStatusCode) === 404) {
-          (_c = this.logger) == null ? void 0 : _c.warn(this.reqId, "File not found", { filePath: normalizedKey });
+          (_c = this.logger) == null ? void 0 : _c.warn(this.reqId, "File not found", { fileKey: normalizedKey });
           return 0;
         }
         throw error;
       }
     });
   }
-  // todo: checked!
-  fileExists(filePath) {
+  fileExists(fileKey) {
     return __async(this, null, function* () {
       var _a2;
       try {
-        const normalizedKey = getNormalizedPath(filePath);
+        const normalizedKey = getNormalizedPath(fileKey);
         if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
         const command = new import_client_s34.HeadObjectCommand({ Bucket: this.bucket, Key: normalizedKey });
         yield this.execute(command);
@@ -1148,10 +1146,9 @@ var S3File = class extends S3Directory {
       }
     });
   }
-  // todo: checked!
-  fileContent(filePath, format = "buffer") {
+  fileContent(fileKey, format = "buffer") {
     return __async(this, null, function* () {
-      let normalizedKey = getNormalizedPath(filePath);
+      let normalizedKey = getNormalizedPath(fileKey);
       if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
       const command = new import_client_s34.GetObjectCommand({ Bucket: this.bucket, Key: normalizedKey });
       const result = yield this.execute(command);
@@ -1182,18 +1179,33 @@ var S3File = class extends S3Directory {
       return buffer;
     });
   }
-  // todo: checked!
-  uploadFile(_0, _1) {
-    return __async(this, arguments, function* (filePath, fileData, acl = "private" /* private */, version = "1.0.0") {
-      const normalizedKey = getNormalizedPath(filePath);
+  uploadFileContent(_0, _1) {
+    return __async(this, arguments, function* (fileKey, fileData, {
+      acl = "private" /* private */,
+      version = "1.0.0",
+      prettier = true
+    } = {}) {
+      const normalizedKey = getNormalizedPath(fileKey);
       if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
+      let body;
+      if (import_buffer.Buffer.isBuffer(fileData)) {
+        body = fileData;
+      } else if (fileData instanceof Uint8Array) {
+        body = fileData;
+      } else if (fileData instanceof import_node_stream.Readable) {
+        body = fileData;
+      } else if (typeof fileData === "string") {
+        body = fileData;
+      } else {
+        body = prettier ? JSON.stringify(fileData, null, 2) : JSON.stringify(fileData);
+      }
       const upload = new import_lib_storage.Upload({
         client: this.s3Client,
         params: {
           Bucket: this.bucket,
           ACL: acl,
           Key: normalizedKey,
-          Body: fileData,
+          Body: body,
           Tagging: `version=${version}`
         }
       });
@@ -1206,10 +1218,9 @@ var S3File = class extends S3Directory {
       };
     });
   }
-  // todo: checked!
-  deleteFile(filePath) {
+  deleteFile(fileKey) {
     return __async(this, null, function* () {
-      const normalizedKey = getNormalizedPath(filePath);
+      const normalizedKey = getNormalizedPath(fileKey);
       if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
       const command = new import_client_s34.DeleteObjectCommand({ Bucket: this.bucket, Key: normalizedKey });
       return yield this.execute(command);
@@ -1224,24 +1235,24 @@ var S3Stream = class _S3Stream extends S3File {
     var _b = _a2, { maxUploadFileSizeRestriction = "10GB" } = _b, props = __objRest(_b, ["maxUploadFileSizeRestriction"]);
     super(props);
     __publicField(this, "maxUploadFileSizeRestriction");
-    // todo: LOCALSTACK SANITY CHECKED - WORKING WELL, DON'T TOUCH!
-    __publicField(this, "getImageFileViewCtrl", ({
+    __publicField(this, "streamImageFileCtrl", ({
       fileKey: _fileKey,
       queryField = "file",
-      paramField = "file",
+      paramsField = "file",
+      headerField = "x-fileKey",
       cachingAgeSeconds = "1y"
     } = {}) => {
       return (req, res, next) => __async(this, null, function* () {
-        var _a2, _b, _c, _d, _e, _f;
-        let fileKey = _fileKey || (((_a2 = req.params) == null ? void 0 : _a2[paramField]) ? decodeURIComponent((_b = req.params) == null ? void 0 : _b[paramField]) : void 0) || (((_c = req.query) == null ? void 0 : _c[queryField]) ? decodeURIComponent((_d = req.query) == null ? void 0 : _d[queryField]) : void 0);
+        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 || fileKey === "/") {
-          (_e = this.logger) == null ? void 0 : _e.warn(req.id, "image fileKey is required");
-          next("image fileKey is required");
+          (_g = this.logger) == null ? void 0 : _g.warn(req.id, "image fileKey is required");
+          next(Error("image fileKey is required"));
           return;
         }
         try {
           const imageBuffer = yield this.fileContent(fileKey, "buffer");
-          const ext = import_pathe2.default.extname(fileKey).slice(1).toLowerCase();
+          const ext = (0, import_pathe2.extname)(fileKey).slice(1).toLowerCase();
           const mimeTypeMap = {
             jpg: "image/jpeg",
             jpeg: "image/jpeg",
@@ -1258,31 +1269,31 @@ var S3Stream = class _S3Stream extends S3File {
           if (cachingAge) res.setHeader("Cache-Control", `public, max-age=${cachingAge}`);
           res.status(200).send(imageBuffer);
         } catch (error) {
-          (_f = this.logger) == null ? void 0 : _f.warn(req.id, "image fileKey not found", __spreadValues({
+          (_h = this.logger) == null ? void 0 : _h.warn(req.id, "image fileKey not found", __spreadValues({
             fileKey
           }, this.localstack && { localstack: this.localstack }));
-          next(`Failed to retrieve image file: ${error.message}`);
+          next(Error(`Failed to retrieve image file: ${error.message}`));
         }
       });
     });
-    // todo: LOCALSTACK SANITY CHECKED - WORKING WELL, DON'T TOUCH!
-    __publicField(this, "getPdfFileViewCtrl", ({
+    __publicField(this, "streamPdfFileCtrl", ({
       fileKey: _fileKey,
       queryField = "file",
-      paramField = "file",
+      paramsField = "file",
+      headerField = "x-fileKey",
       cachingAgeSeconds = "1y"
     } = {}) => {
       return (req, res, next) => __async(this, null, function* () {
-        var _a2, _b, _c, _d, _e, _f;
-        let fileKey = _fileKey || (((_a2 = req.params) == null ? void 0 : _a2[paramField]) ? decodeURIComponent((_b = req.params) == null ? void 0 : _b[paramField]) : void 0) || (((_c = req.query) == null ? void 0 : _c[queryField]) ? decodeURIComponent((_d = req.query) == null ? void 0 : _d[queryField]) : void 0);
+        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) {
-          (_e = this.logger) == null ? void 0 : _e.warn(req.id, "pdf fileKey is required");
-          next("pdf fileKey is required");
+          (_g = this.logger) == null ? void 0 : _g.warn(req.id, "pdf fileKey is required");
+          next(Error("pdf fileKey is required"));
           return;
         }
         try {
           const fileBuffer = yield this.fileContent(fileKey, "buffer");
-          const ext = import_pathe2.default.extname(fileKey).slice(1).toLowerCase();
+          const ext = (0, import_pathe2.extname)(fileKey).slice(1).toLowerCase();
           const mimeTypeMap = {
             pdf: "application/pdf",
             txt: "text/plain",
@@ -1294,17 +1305,18 @@ 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);
           res.setHeader("Content-Type", contentType);
-          res.setHeader("Content-Disposition", `inline; filename="${import_pathe2.default.basename(fileKey)}"`);
+          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.status(200).send(fileBuffer);
         } catch (error) {
-          (_f = this.logger) == null ? void 0 : _f.warn(req.id, "pdf fileKey not found", __spreadValues({
+          (_h = this.logger) == null ? void 0 : _h.warn(req.id, "pdf fileKey not found", __spreadValues({
             fileKey
           }, this.localstack && { localstack: this.localstack }));
-          next(`Failed to retrieve pdf file: ${error.message}`);
+          next(Error(`Failed to retrieve pdf file: ${error.message}`));
         }
       });
     });
@@ -1333,7 +1345,6 @@ var S3Stream = class _S3Stream extends S3File {
       return response.Body;
     });
   }
-  // todo: LOCALSTACK SANITY CHECKED - WORKING WELL, DON'T TOUCH!
   streamVideoFile(_0) {
     return __async(this, arguments, function* (fileKey, {
       Range,
@@ -1362,7 +1373,7 @@ var S3Stream = class _S3Stream extends S3File {
           }
         };
       } catch (error) {
-        (_a2 = this.logger) == null ? void 0 : _a2.warn(this.reqId, "getS3VideoStream error", {
+        (_a2 = this.logger) == null ? void 0 : _a2.warn(this.reqId, "streamVideoFile error", {
           Bucket: this.bucket,
           fileKey: normalizedKey,
           Range,
@@ -1372,29 +1383,39 @@ var S3Stream = class _S3Stream extends S3File {
       }
     });
   }
-  // todo: LOCALSTACK SANITY CHECKED - WORKING WELL, DON'T TOUCH!
-  getStreamVideoFileCtrl(_0) {
+  streamVideoFileCtrl() {
     return __async(this, arguments, function* ({
-      fileKey,
       allowedWhitelist,
-      contentType = "video/mp4",
-      streamTimeoutMS = 3e4,
-      bufferMB = 5
-    }) {
+      bufferMB = 5,
+      contentType,
+      fileKey: _fileKey,
+      queryField = "file",
+      paramsField = "file",
+      headerField = "x-fileKey",
+      streamTimeoutMS = 3e4
+    } = {}) {
       return (req, res, next) => __async(this, null, function* () {
-        var _a2, _b, _c, _d, _e, _f;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+        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]) ? (_f = req.headers) == null ? void 0 : _f[headerField] : void 0;
+        if (!fileKey || fileKey === "/") {
+          (_g = this.logger) == null ? void 0 : _g.warn(req.id, "fileKey video stream is required");
+          next(Error("fileKey video stream is required"));
+          return;
+        }
         let normalizedKey = getNormalizedPath(fileKey);
         if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
-        const isExists = yield this.fileExists(normalizedKey);
-        const fileSize = yield this.sizeOf(normalizedKey);
         let Range;
-        if (!isExists) {
-          next(Error(`File does not exist: "${normalizedKey}"`));
-          return;
-        }
+        let fileSize;
         try {
+          const fileInfo = yield this.fileInfo(normalizedKey);
+          if (!fileInfo) {
+            next(Error(`File does not exist: "${normalizedKey}"`));
+            return;
+          }
+          fileSize = getUnitBytes(fileInfo.ContentLength);
           if (req.method === "HEAD") {
-            res.setHeader("Content-Type", contentType);
+            res.setHeader("Content-Type", fileInfo.ContentType);
             res.setHeader("Accept-Ranges", "bytes");
             if (fileSize) res.setHeader("Content-Length", String(fileSize));
             return res.status(200).end();
@@ -1427,14 +1448,14 @@ var S3Stream = class _S3Stream extends S3File {
             abortSignal: abort.signal
           });
           const { body, meta } = result;
-          const origin = Array.isArray(allowedWhitelist) ? allowedWhitelist.includes((_a2 = req.headers.origin) != null ? _a2 : "") ? req.headers.origin : void 0 : allowedWhitelist;
+          const origin = Array.isArray(allowedWhitelist) ? allowedWhitelist.includes((_h = req.headers.origin) != null ? _h : "") ? req.headers.origin : void 0 : allowedWhitelist;
           if (origin) {
             res.setHeader("Access-Control-Allow-Origin", origin);
             res.setHeader("Vary", "Origin");
           }
-          const finalContentType = contentType.startsWith("video/") ? contentType : `video/${contentType}`;
-          res.setHeader("Content-Type", (_b = meta.contentType) != null ? _b : finalContentType);
-          res.setHeader("Accept-Ranges", (_c = meta.acceptRanges) != null ? _c : "bytes");
+          const finalContentType = (contentType == null ? void 0 : contentType.startsWith("video/")) ? contentType : `video/${contentType || "mp4"}`;
+          res.setHeader("Content-Type", (_i = meta.contentType) != null ? _i : finalContentType);
+          res.setHeader("Accept-Ranges", (_j = meta.acceptRanges) != null ? _j : "bytes");
           if (Range && meta.contentRange) {
             res.status(206);
             res.setHeader("Content-Range", meta.contentRange);
@@ -1465,11 +1486,11 @@ var S3Stream = class _S3Stream extends S3File {
             return;
           }
           if (!res.headersSent) {
-            (_f = this.logger) == null ? void 0 : _f.warn(req.id, "caught exception in stream controller", {
-              error: (_d = error == null ? void 0 : error.message) != null ? _d : String(error),
+            (_m = this.logger) == null ? void 0 : _m.warn(req.id, "caught exception in stream controller", {
+              error: (_k = error == null ? void 0 : error.message) != null ? _k : String(error),
               key: fileKey,
               url: req.originalUrl,
-              userId: (_e = req.user) == null ? void 0 : _e._id
+              userId: (_l = req.user) == null ? void 0 : _l._id
             });
             next(error);
             return;
@@ -1485,14 +1506,23 @@ var S3Stream = class _S3Stream extends S3File {
       });
     });
   }
-  // todo: LOCALSTACK SANITY CHECKED - WORKING WELL, DON'T TOUCH!
-  getStreamFileCtrl(_0) {
-    return __async(this, arguments, function* (fileKey, {
+  streamFileCtrl() {
+    return __async(this, arguments, function* ({
+      fileKey: _fileKey,
       filename,
-      forDownloading = false
+      forDownloading = false,
+      paramsField = "file",
+      queryField = "file",
+      headerField = "x-fileKey"
     } = {}) {
       return (req, res, next) => __async(this, null, function* () {
-        var _a2, _b;
+        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);
+        if (!fileKey || fileKey === "/") {
+          (_g = this.logger) == null ? void 0 : _g.warn(req.id, "fileKey stream is required");
+          next(Error("fileKey stream is required"));
+          return;
+        }
         const abort = new AbortController();
         let stream = null;
         const onClose = () => {
@@ -1523,7 +1553,7 @@ var S3Stream = class _S3Stream extends S3File {
           const fileName = filename || normalizedKey.split("/").pop() || "download";
           res.setHeader("Content-Type", fileInfo.ContentType || "application/octet-stream");
           if (forDownloading) {
-            res.setHeader("Content-Disposition", `attachment; filename="${fileName}"`);
+            res.setHeader("Content-Disposition", `attachment; filename="${encodeURIComponent(fileName)}"`);
           }
           if (fileInfo.ContentLength) {
             res.setHeader("Content-Length", String(fileInfo.ContentLength));
@@ -1544,13 +1574,13 @@ var S3Stream = class _S3Stream extends S3File {
         } catch (error) {
           abort.abort();
           if (stream) {
-            (_a2 = stream.destroy) == null ? void 0 : _a2.call(stream);
+            (_h = stream.destroy) == null ? void 0 : _h.call(stream);
           }
           const isBenignStreamError = (error == null ? void 0 : error.code) === "ERR_STREAM_PREMATURE_CLOSE" || (error == null ? void 0 : error.name) === "AbortError" || (error == null ? void 0 : error.code) === "ECONNRESET";
           if (isBenignStreamError) {
             return;
           }
-          (_b = this.logger) == null ? void 0 : _b.error(this.reqId, "Failed to stream file", { fileKey: normalizedKey, error });
+          (_i = this.logger) == null ? void 0 : _i.error(this.reqId, "Failed to stream file", { fileKey: normalizedKey, error });
           if (!res.headersSent) {
             next(error);
           } else if (!res.writableEnded) {
@@ -1565,17 +1595,26 @@ var S3Stream = class _S3Stream extends S3File {
       });
     });
   }
-  // todo: LOCALSTACK SANITY CHECKED - WORKING WELL, DON'T TOUCH!
-  getStreamZipFileCtr(_0) {
-    return __async(this, arguments, function* (fileKey, {
+  streamZipFileCtr() {
+    return __async(this, arguments, function* ({
+      fileKey: _fileKey,
       filename: _filename,
+      queryField = "file",
+      paramsField = "file",
+      headerField = "x-fileKey",
       compressionLevel = 5
     } = {}) {
       return (req, res, next) => __async(this, null, function* () {
-        var _a2, _b, _c, _d, _e;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
         const abort = new AbortController();
         const onClose = () => abort.abort();
         try {
+          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);
+          if (!fileKey || fileKey === "/") {
+            (_g = this.logger) == null ? void 0 : _g.warn(req.id, "fileKey video stream is required");
+            next(Error("fileKey video stream is required"));
+            return;
+          }
           const fileKeys = [].concat(fileKey).map((fileKey2) => getNormalizedPath(fileKey2)).filter((v) => v && v !== "/");
           if (!fileKeys.length) {
             throw new Error("No file keys provided");
@@ -1583,7 +1622,7 @@ var S3Stream = class _S3Stream extends S3File {
           let filename = _filename || (/* @__PURE__ */ new Date()).toISOString();
           filename = filename.endsWith(".zip") ? filename : `${filename}.zip`;
           req.once("close", onClose);
-          (_a2 = this.logger) == null ? void 0 : _a2.info(this.reqId, "Starting parallel file download...", { fileCount: fileKeys.length });
+          (_h = this.logger) == null ? void 0 : _h.info(this.reqId, "Starting parallel file download...", { fileCount: fileKeys.length });
           const downloadPromises = fileKeys.map((fileKey2) => __async(this, null, function* () {
             var _a3, _b2, _c2;
             try {
@@ -1633,7 +1672,7 @@ var S3Stream = class _S3Stream extends S3File {
             }
             return;
           }
-          (_b = this.logger) == null ? void 0 : _b.info(this.reqId, "All files downloaded, measuring zip size...", {
+          (_i = this.logger) == null ? void 0 : _i.info(this.reqId, "All files downloaded, measuring zip size...", {
             fileCount: fileBuffers.length,
             totalSizeMB: (fileBuffers.reduce((sum, f) => sum + f.buffer.length, 0) / (1024 * 1024)).toFixed(2)
           });
@@ -1651,13 +1690,13 @@ var S3Stream = class _S3Stream extends S3File {
             req.off("close", onClose);
             return;
           }
-          (_c = this.logger) == null ? void 0 : _c.info(this.reqId, "Zip size calculated", {
+          (_j = this.logger) == null ? void 0 : _j.info(this.reqId, "Zip size calculated", {
             actualZipSize,
             sizeMB: (actualZipSize / (1024 * 1024)).toFixed(2)
           });
           const actualArchive = (0, import_archiver.default)("zip", { zlib: { level: compressionLevel } });
           res.setHeader("Content-Type", "application/zip");
-          res.setHeader("Content-Disposition", `attachment; filename="${filename}"`);
+          res.setHeader("Content-Disposition", `attachment; filename="${encodeURIComponent(filename)}"`);
           res.setHeader("Content-Length", String(actualZipSize));
           res.setHeader("Access-Control-Expose-Headers", "Content-Type, Content-Disposition, Content-Length");
           actualArchive.on("error", (err) => {
@@ -1674,7 +1713,7 @@ var S3Stream = class _S3Stream extends S3File {
             actualArchive.append(file.buffer, { name: file.name });
           }
           yield actualArchive.finalize();
-          (_d = this.logger) == null ? void 0 : _d.info(this.reqId, "Zip download completed", {
+          (_k = this.logger) == null ? void 0 : _k.info(this.reqId, "Zip download completed", {
             fileCount: fileBuffers.length,
             totalSize: actualZipSize
           });
@@ -1686,7 +1725,7 @@ var S3Stream = class _S3Stream extends S3File {
             return;
           }
           if (!res.headersSent) {
-            (_e = this.logger) == null ? void 0 : _e.error(this.reqId, "Failed to create zip archive", { error });
+            (_l = this.logger) == null ? void 0 : _l.error(this.reqId, "Failed to create zip archive", { error });
             next(error);
           } else if (!res.writableEnded) {
             try {
@@ -1703,13 +1742,13 @@ var S3Stream = class _S3Stream extends S3File {
   static fileFilter(types, fileExt) {
     const fileTypesChecker = (fileExt == null ? void 0 : fileExt.length) ? new RegExp(`\\.(${fileExt.join("|")})$`, "i") : void 0;
     return function(_req, file, cb) {
-      const fileExtension = import_pathe2.default.extname(file.originalname).substring(1);
-      const extname = fileTypesChecker ? fileTypesChecker.test(`.${fileExtension}`) : true;
+      const fileExtension = (0, import_pathe2.extname)(file.originalname).substring(1);
+      const ext = fileTypesChecker ? fileTypesChecker.test(`.${fileExtension}`) : true;
       const mimeType = (types == null ? void 0 : types.length) ? types.some((type) => file.mimetype.startsWith(`${type}/`)) : true;
-      if (mimeType && extname) {
+      if (mimeType && ext) {
         return cb(null, true);
       }
-      const errorMsg = !extname ? `Upload File Ext Error: Allowed extensions: [${fileExt == null ? void 0 : fileExt.join(", ")}]. Got: ${fileExtension}` : `Upload File Type Error: Allowed types: [${types == null ? void 0 : types.join(", ")}]. Got: ${file.mimetype}`;
+      const errorMsg = !ext ? `Upload File Ext Error: Allowed extensions: [${fileExt == null ? void 0 : fileExt.join(", ")}]. Got: ${fileExtension}` : `Upload File Type Error: Allowed types: [${types == null ? void 0 : types.join(", ")}]. Got: ${file.mimetype}`;
       return cb(new Error(errorMsg));
     };
   }
@@ -1764,7 +1803,7 @@ var S3Stream = class _S3Stream extends S3File {
    * Middleware for uploading a single file
    * Adds the uploaded file info to req.s3File
    */
-  uploadSingleFile(fieldName, directoryPath, options = {}) {
+  uploadSingleFileMW(fieldName, directoryPath, options = {}) {
     var _a2;
     let normalizedPath = getNormalizedPath(directoryPath);
     if (normalizedPath !== "/" && directoryPath !== "" && directoryPath !== void 0) normalizedPath += "/";
@@ -1796,13 +1835,14 @@ var S3Stream = class _S3Stream extends S3File {
    * Middleware for uploading multiple files with the same field name
    * Adds the uploaded files info to req.s3Files
    */
-  uploadMultipleFiles(fieldName, directoryPath, options = {}) {
+  uploadMultipleFilesMW(fieldName, directoryPath, _c = {}) {
+    var _d = _c, { maxFilesCount } = _d, options = __objRest(_d, ["maxFilesCount"]);
     let normalizedPath = getNormalizedPath(directoryPath);
     if (normalizedPath !== "/" && directoryPath !== "" && directoryPath !== void 0) normalizedPath += "/";
     else normalizedPath = "";
     const upload = this.getUploadFileMW(normalizedPath, options);
     return (req, res, next) => {
-      const mw = upload.array(fieldName, options.maxFilesCount || void 0);
+      const mw = upload.array(fieldName, maxFilesCount || void 0);
       mw(req, res, (err) => {
         var _a2, _b;
         if (err) {
@@ -1825,7 +1865,7 @@ var S3Stream = class _S3Stream extends S3File {
    * Middleware for uploading any files (mixed field names)
    * Adds the uploaded files info to req.s3AllFiles
    */
-  uploadAnyFiles(directoryPath, maxCount, options = {}) {
+  uploadAnyFilesMW(directoryPath, maxCount, options = {}) {
     let normalizedPath = getNormalizedPath(directoryPath);
     if (normalizedPath !== "/" && normalizedPath !== "" && directoryPath !== void 0) normalizedPath += "/";
     else normalizedPath = "";
@@ -1917,7 +1957,6 @@ var S3LocalstackUtil = class extends S3Util {
   constructor(props) {
     super(__spreadProps(__spreadValues({}, props), { localstack: true }));
   }
-  // todo: checked!
   directoryList(directoryPath) {
     return __async(this, null, function* () {
       var _a2;
@@ -1953,7 +1992,6 @@ var S3LocalstackUtil = class extends S3Util {
       return { directories, files };
     });
   }
-  // todo: checked!
   directoryListPaginated(_0) {
     return __async(this, arguments, function* (directoryPath, {
       pageSize = 100,