@hdriel/aws-utils 1.0.4 → 1.1.2

package/dist/index.js

@@ -19,6 +19,18 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
@@ -216,42 +228,19 @@ var LambdaUtil = class {
   }
 };
 
-// src/aws/s3-bucket.ts
-import ms from "ms";
+// src/aws/s3/s3-util.localstack.ts
+import { ListObjectsV2Command as ListObjectsV2Command4 } from "@aws-sdk/client-s3";
+
+// src/aws/s3/s3-stream.ts
 import path from "pathe";
-import http from "http";
-import https from "https";
 import { pipeline } from "stream";
 import { promisify } from "util";
-import { Upload } from "@aws-sdk/lib-storage";
-import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
-import { NodeHttpHandler } from "@smithy/node-http-handler";
-import { Buffer as Buffer2 } from "buffer";
+import { Buffer as Buffer3 } from "buffer";
 import archiver from "archiver";
-import { Readable } from "stream";
-import {
-  CreateBucketCommand,
-  GetObjectCommand,
-  S3Client,
-  DeleteBucketCommand,
-  HeadBucketCommand,
-  PutPublicAccessBlockCommand,
-  PutBucketPolicyCommand,
-  ListBucketsCommand,
-  GetBucketPolicyCommand,
-  GetBucketVersioningCommand,
-  GetBucketEncryptionCommand,
-  GetPublicAccessBlockCommand,
-  GetBucketAclCommand,
-  PutObjectCommand,
-  HeadObjectCommand,
-  ListObjectsCommand,
-  PutObjectTaggingCommand,
-  GetObjectTaggingCommand,
-  DeleteObjectCommand,
-  ListObjectsV2Command,
-  DeleteObjectsCommand
-} from "@aws-sdk/client-s3";
+import { Readable as Readable2 } from "stream";
+import multerS3 from "multer-s3";
+import multer from "multer";
+import { GetObjectCommand as GetObjectCommand2 } from "@aws-sdk/client-s3";
 
 // src/utils/consts.ts
 var ACLs = /* @__PURE__ */ ((ACLs2) => {
@@ -265,11 +254,8 @@ var ACLs = /* @__PURE__ */ ((ACLs2) => {
 import pLimit from "p-limit";
 var s3Limiter = pLimit(4);
 
-// src/aws/s3-bucket.ts
-import multer from "multer";
-import multerS3 from "multer-s3";
+// src/utils/helpers.ts
 import bytes from "bytes";
-var pump = promisify(pipeline);
 var parseRangeHeader = (range, contentLength, chunkSize) => {
   if (!range || !range.startsWith("bytes=")) return null;
   const rangeParts = range.replace("bytes=", "").split("-");
@@ -282,34 +268,88 @@ var parseRangeHeader = (range, contentLength, chunkSize) => {
   }
   return [start, Math.min(end, end)];
 };
-var getNormalizedPath = (directoryPath) => decodeURIComponent((directoryPath == null ? void 0 : directoryPath.replace(/^\/+/, "").replace(/\/+$/, "")) || "");
-var S3BucketUtil = class _S3BucketUtil {
+var getNormalizedPath = (directoryPath) => {
+  return decodeURIComponent((directoryPath == null ? void 0 : directoryPath.trim().replace(/^\/+/, "").replace(/\/+$/, "").replace(/\/+/g, "/")) || "");
+};
+var getFileSize = (maxFileSize, defaultMaxFileSize) => {
+  var _a2;
+  const fileSizeUnitValue = (_a2 = maxFileSize != null ? maxFileSize : defaultMaxFileSize) != null ? _a2 : "";
+  const fileSize = typeof fileSizeUnitValue === "number" ? fileSizeUnitValue : bytes(fileSizeUnitValue);
+  return fileSize != null ? fileSize : void 0;
+};
+
+// src/aws/s3/s3-file.ts
+import { Buffer as Buffer2 } from "buffer";
+import "stream";
+import ms from "ms";
+import { Upload } from "@aws-sdk/lib-storage";
+import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
+import {
+  DeleteObjectCommand as DeleteObjectCommand2,
+  GetObjectCommand,
+  GetObjectTaggingCommand,
+  HeadObjectCommand as HeadObjectCommand2,
+  ListObjectsCommand,
+  ListObjectsV2Command as ListObjectsV2Command3,
+  PutObjectTaggingCommand
+} from "@aws-sdk/client-s3";
+
+// src/aws/s3/s3-directory.ts
+import {
+  DeleteObjectCommand,
+  DeleteObjectsCommand as DeleteObjectsCommand2,
+  HeadObjectCommand,
+  ListObjectsV2Command as ListObjectsV2Command2,
+  PutObjectCommand
+} from "@aws-sdk/client-s3";
+
+// src/aws/s3/s3-bucket.ts
+import {
+  CreateBucketCommand,
+  DeleteBucketCommand,
+  DeleteObjectsCommand,
+  GetBucketAclCommand,
+  GetBucketEncryptionCommand,
+  GetBucketPolicyCommand,
+  GetBucketVersioningCommand,
+  GetPublicAccessBlockCommand,
+  HeadBucketCommand,
+  ListBucketsCommand,
+  ListObjectsV2Command,
+  PutBucketPolicyCommand,
+  PutPublicAccessBlockCommand
+} from "@aws-sdk/client-s3";
+
+// src/aws/s3/s3-base.ts
+import http from "http";
+import https from "https";
+import { NodeHttpHandler } from "@smithy/node-http-handler";
+import { S3Client } from "@aws-sdk/client-s3";
+var S3Base = class {
   constructor({
     logger: logger2,
-    bucket,
     reqId,
     accessKeyId = AWSConfigSharingUtil.accessKeyId,
     secretAccessKey = AWSConfigSharingUtil.secretAccessKey,
     endpoint = AWSConfigSharingUtil.endpoint,
     region = AWSConfigSharingUtil.region,
     s3ForcePathStyle = true,
-    maxUploadFileSizeRestriction = "10GB"
+    // @ts-ignore
+    localstack = false
   }) {
     __publicField(this, "s3Client");
-    __publicField(this, "bucket");
     __publicField(this, "endpoint");
     __publicField(this, "region");
     __publicField(this, "logger");
     __publicField(this, "reqId");
-    __publicField(this, "maxUploadFileSizeRestriction");
+    __publicField(this, "localstack", false);
     const credentials = { accessKeyId, secretAccessKey };
     const options = __spreadValues(__spreadValues(__spreadValues({}, accessKeyId && secretAccessKey && { credentials }), endpoint && { endpoint }), region && { region });
     this.endpoint = endpoint;
     this.region = region;
-    this.bucket = bucket;
     this.logger = logger2;
     this.reqId = reqId != null ? reqId : null;
-    this.maxUploadFileSizeRestriction = maxUploadFileSizeRestriction;
+    this.localstack = localstack;
     const s3ClientParams = __spreadProps(__spreadValues(__spreadValues({}, options), s3ForcePathStyle && { forcePathStyle: s3ForcePathStyle }), {
       requestHandler: new NodeHttpHandler({
         httpAgent: new http.Agent({ keepAlive: true, maxSockets: 300 }),
@@ -320,17 +360,39 @@ var S3BucketUtil = class _S3BucketUtil {
     });
     this.s3Client = new S3Client(s3ClientParams);
   }
-  get link() {
-    return this.endpoint === "http://localhost:4566" ? `${this.endpoint}/${this.bucket}/` : `https://s3.${this.region}.amazonaws.com/${this.bucket}/`;
-  }
   execute(command, options) {
     return __async(this, null, function* () {
       return this.s3Client.send(command, options);
     });
   }
-  // ##### BUCKET BLOCK ##########################
+};
+
+// src/aws/s3/s3-bucket.ts
+var S3Bucket = class extends S3Base {
+  constructor(_a2) {
+    var _b = _a2, { bucket } = _b, props = __objRest(_b, ["bucket"]);
+    super(props);
+    __publicField(this, "_bucket");
+    __publicField(this, "initializedBucket", "");
+    this._bucket = decodeURIComponent(bucket);
+  }
+  get link() {
+    return this.endpoint === "http://localhost:4566" ? `${this.endpoint}/${this.bucket}/` : `https://s3.${this.region}.amazonaws.com/${this.bucket}/`;
+  }
+  get bucket() {
+    return this._bucket;
+  }
+  changeBucket(bucket) {
+    this._bucket = decodeURIComponent(bucket);
+    this.initializedBucket = "";
+  }
   getBucketList() {
-    return __async(this, arguments, function* (options = {}, includePublicAccess = false) {
+    return __async(this, arguments, function* (_c = {}) {
+      var _d = _c, {
+        includePublicAccess
+      } = _d, options = __objRest(_d, [
+        "includePublicAccess"
+      ]);
       const command = new ListBucketsCommand(options);
       const response = yield this.execute(command);
       const responseData = (response == null ? void 0 : response.Buckets) || null;
@@ -427,15 +489,22 @@ var S3BucketUtil = class _S3BucketUtil {
     });
   }
   initBucket() {
-    return __async(this, arguments, function* (acl = "private" /* private */, includeConstraintLocation = false) {
+    return __async(this, arguments, function* (acl = "private" /* private */, {
+      includeConstraintLocation = false,
+      skipInitializedBucket = false
+    } = {}) {
       var _a2;
       const bucketName = this.bucket;
+      if (skipInitializedBucket && this.initializedBucket === bucketName) {
+        return;
+      }
       const isExists = yield this.isBucketExists();
       if (isExists) {
         (_a2 = this.logger) == null ? void 0 : _a2.info(this.reqId, `Bucket already exists.`, { bucketName });
         return;
       }
       const data = acl === "private" /* private */ ? yield this.initAsPrivateBucket(includeConstraintLocation) : yield this.initAsPublicBucket();
+      this.initializedBucket = bucketName;
       return data;
     });
   }
@@ -588,17 +657,42 @@ var S3BucketUtil = class _S3BucketUtil {
       return data;
     });
   }
-  // ##### DIRECTORY BLOCK ##########################
+};
+
+// src/aws/s3/s3-directory.ts
+var S3Directory = class extends S3Bucket {
+  constructor(props) {
+    super(props);
+  }
+  // todo: checked!
+  directoryExists(directoryPath) {
+    return __async(this, null, function* () {
+      var _a2;
+      try {
+        const normalizedKey = getNormalizedPath(directoryPath);
+        if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
+        const command = new HeadObjectCommand({ Bucket: this.bucket, Key: normalizedKey });
+        yield this.execute(command);
+        return true;
+      } catch (error) {
+        if (error.name === "NotFound" || ((_a2 = error.$metadata) == null ? void 0 : _a2.httpStatusCode) === 404) {
+          return false;
+        }
+        throw error;
+      }
+    });
+  }
+  // todo: checked!
   createDirectory(directoryPath) {
     return __async(this, null, function* () {
       let normalizedPath = getNormalizedPath(directoryPath);
-      if (!normalizedPath) throw new Error("No directory path provided");
-      if (normalizedPath === "/") normalizedPath = "";
+      if (!normalizedPath || normalizedPath === "/") throw new Error("No directory path provided");
       const command = new PutObjectCommand({ Bucket: this.bucket, Key: `${normalizedPath}/` });
       const result = yield this.execute(command);
       return result;
     });
   }
+  // todo: checked!
   deleteDirectory(directoryPath) {
     return __async(this, null, function* () {
       var _a2, _b, _c, _d, _e, _f, _g;
@@ -609,7 +703,7 @@ var S3BucketUtil = class _S3BucketUtil {
       let ContinuationToken = void 0;
       do {
         const listResp = yield this.execute(
-          new ListObjectsV2Command({
+          new ListObjectsV2Command2({
             Bucket: this.bucket,
             Prefix: normalizedPath,
             ContinuationToken
@@ -617,7 +711,7 @@ var S3BucketUtil = class _S3BucketUtil {
         );
         if (listResp.Contents && listResp.Contents.length > 0) {
           const deleteResult = yield this.execute(
-            new DeleteObjectsCommand({
+            new DeleteObjectsCommand2({
               Bucket: this.bucket,
               Delete: {
                 Objects: listResp.Contents.map((obj) => ({ Key: obj.Key })),
@@ -636,7 +730,7 @@ var S3BucketUtil = class _S3BucketUtil {
         ContinuationToken = listResp.NextContinuationToken;
       } while (ContinuationToken);
       if (totalDeletedCount === 0) {
-        const directoryExists = yield this.fileExists(normalizedPath);
+        const directoryExists = yield this.directoryExists(normalizedPath);
         if (!directoryExists) {
           (_d = this.logger) == null ? void 0 : _d.debug(this.reqId, `Directory not found`, { directoryPath: normalizedPath });
           return null;
@@ -668,34 +762,64 @@ var S3BucketUtil = class _S3BucketUtil {
       };
     });
   }
+  // todo: checked!
   directoryList(directoryPath) {
     return __async(this, null, function* () {
+      var _a2;
       let normalizedPath = getNormalizedPath(directoryPath);
       if (normalizedPath !== "/" && directoryPath !== "" && directoryPath !== void 0) normalizedPath += "/";
-      else normalizedPath = "";
-      const result = yield this.execute(
-        new ListObjectsV2Command({
-          Bucket: this.bucket,
-          Prefix: normalizedPath,
-          Delimiter: "/"
-        })
-      );
+      else normalizedPath = this.localstack ? "" : "/";
+      let result;
+      if (normalizedPath === "") {
+        const [fileResponse, { CommonPrefixes }] = yield Promise.all([
+          this.execute(
+            new ListObjectsV2Command2({
+              Bucket: this.bucket,
+              Prefix: "/",
+              Delimiter: "/"
+            })
+          ),
+          yield this.execute(
+            new ListObjectsV2Command2({
+              Bucket: this.bucket,
+              Prefix: "",
+              Delimiter: "/"
+            })
+          )
+        ]);
+        result = fileResponse;
+        result.CommonPrefixes = CommonPrefixes;
+      } else {
+        result = yield this.execute(
+          new ListObjectsV2Command2({
+            Bucket: this.bucket,
+            Prefix: normalizedPath,
+            Delimiter: "/"
+          })
+        );
+      }
+      (_a2 = this.logger) == null ? void 0 : _a2.debug(null, "#### directoryList", {
+        normalizedPath,
+        CommonPrefixes: result.CommonPrefixes,
+        ContentFile: result.Contents
+      });
       const directories = (result.CommonPrefixes || []).map((prefix) => prefix.Prefix).map((prefix) => {
         const relativePath = prefix.replace(normalizedPath, "");
         const dir = relativePath.replace(/\/$/, "");
         return dir;
       }).filter((dir) => dir);
       const files = (result.Contents || []).filter((content) => {
-        var _a2;
-        return content.Key !== normalizedPath && !((_a2 = content.Key) == null ? void 0 : _a2.endsWith("/"));
+        var _a3;
+        return content.Key !== normalizedPath && !((_a3 = content.Key) == null ? void 0 : _a3.endsWith("/"));
       }).map((content) => __spreadProps(__spreadValues({}, content), {
         Name: content.Key.replace(normalizedPath, "") || content.Key,
-        Location: `${this.link}${content.Key}`,
+        Location: `${this.link}${content.Key.replace(/^\//, "")}`,
         LastModified: new Date(content.LastModified)
       }));
       return { directories, files };
     });
   }
+  // todo: checked!
   directoryListPaginated(_0) {
     return __async(this, arguments, function* (directoryPath, {
       pageSize = 100,
@@ -710,8 +834,9 @@ var S3BucketUtil = class _S3BucketUtil {
       let allDirectories = [];
       let allFiles = [];
       while (currentPage <= pageNumber) {
-        const result = yield this.execute(
-          new ListObjectsV2Command({
+        let result;
+        result = yield this.execute(
+          new ListObjectsV2Command2({
             Bucket: this.bucket,
             Prefix: normalizedPath,
             Delimiter: "/",
@@ -729,7 +854,7 @@ var S3BucketUtil = class _S3BucketUtil {
             return content.Key !== normalizedPath && !((_a2 = content.Key) == null ? void 0 : _a2.endsWith("/"));
           }).map((content) => __spreadProps(__spreadValues({}, content), {
             Name: content.Key.replace(normalizedPath, "") || content.Key,
-            Location: `${this.link}${content.Key}`,
+            Location: `${this.link}${content.Key.replace(/^\//, "")}`,
             LastModified: new Date(content.LastModified)
           }));
         }
@@ -752,19 +877,21 @@ var S3BucketUtil = class _S3BucketUtil {
    */
   directoryListRecursive(directoryPath) {
     return __async(this, null, function* () {
+      var _a2;
       let normalizedPath = getNormalizedPath(directoryPath);
       if (normalizedPath !== "/" && directoryPath !== "" && directoryPath !== void 0) normalizedPath += "/";
-      else normalizedPath = "";
+      else normalizedPath = "/";
       const allDirectories = [];
       const allFiles = [];
       let ContinuationToken = void 0;
       do {
-        const command = new ListObjectsV2Command({
-          Bucket: this.bucket,
-          Prefix: normalizedPath,
-          ContinuationToken
-        });
-        const result = yield this.execute(command);
+        const result = yield this.execute(
+          new ListObjectsV2Command2({
+            Bucket: this.bucket,
+            Prefix: normalizedPath,
+            ContinuationToken
+          })
+        );
         if (result.Contents) {
           for (const content of result.Contents) {
             const fullPath = content.Key;
@@ -776,8 +903,8 @@ var S3BucketUtil = class _S3BucketUtil {
               allFiles.push(__spreadProps(__spreadValues({}, content), {
                 Name: filename,
                 Path: fullPath,
-                Location: `${this.link}${content.Key}`,
-                LastModified: new Date(content.LastModified)
+                Location: content.Key ? `${this.link}${(_a2 = content.Key) == null ? void 0 : _a2.replace(/^\//, "")}` : "",
+                LastModified: content.LastModified ? new Date(content.LastModified) : null
               }));
             }
           }
@@ -833,7 +960,7 @@ var S3BucketUtil = class _S3BucketUtil {
         treeNode.children.push({
           path: "/" + file.Key,
           name: file.Name,
-          location: `${this.link}${file.Key}`,
+          location: `${this.link}${file.Key.replace(/^\//, "")}`,
           type: "file",
           size: file.Size,
           lastModified: file.LastModified
@@ -847,14 +974,18 @@ var S3BucketUtil = class _S3BucketUtil {
       return treeNode;
     });
   }
-  // ##### FILES BLOCK ##########################
+};
+
+// src/aws/s3/s3-file.ts
+var S3File = class extends S3Directory {
+  constructor(props) {
+    super(props);
+  }
   fileInfo(filePath) {
     return __async(this, null, function* () {
       const normalizedKey = getNormalizedPath(filePath);
-      if (!normalizedKey || normalizedKey === "/") {
-        throw new Error("No file key provided");
-      }
-      const command = new HeadObjectCommand({ Bucket: this.bucket, Key: normalizedKey });
+      if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
+      const command = new HeadObjectCommand2({ Bucket: this.bucket, Key: normalizedKey });
       return yield this.execute(command);
     });
   }
@@ -863,7 +994,7 @@ var S3BucketUtil = class _S3BucketUtil {
       var _a2, _b;
       let normalizedPath = getNormalizedPath(directoryPath);
       if (normalizedPath !== "/" && directoryPath !== "" && directoryPath !== void 0) normalizedPath += "/";
-      else normalizedPath = "";
+      else normalizedPath = this.localstack ? "" : "/";
       const prefix = normalizedPath + (fileNamePrefix || "");
       const command = new ListObjectsCommand({
         Bucket: this.bucket,
@@ -873,10 +1004,10 @@ var S3BucketUtil = class _S3BucketUtil {
       const result = yield this.execute(command);
       const files = ((_a2 = result.Contents) != null ? _a2 : []).filter((v) => v).map(
         (content) => {
-          var _a3, _b2;
+          var _a3, _b2, _c;
           return __spreadProps(__spreadValues({}, content), {
             Name: (_b2 = (_a3 = content.Key) == null ? void 0 : _a3.replace(prefix, "")) != null ? _b2 : content.Key,
-            Location: `${this.link}${content.Key}`,
+            Location: content.Key ? `${this.link}${(_c = content.Key) == null ? void 0 : _c.replace(/^\//, "")}` : "",
             LastModified: content.LastModified ? new Date(content.LastModified) : null
           });
         }
@@ -885,6 +1016,7 @@ var S3BucketUtil = class _S3BucketUtil {
       return files;
     });
   }
+  // todo: checked!
   fileListInfoPaginated(_0) {
     return __async(this, arguments, function* (directoryPath, {
       fileNamePrefix,
@@ -902,7 +1034,7 @@ var S3BucketUtil = class _S3BucketUtil {
       let resultFiles = [];
       while (currentPage <= pageNumber) {
         const result = yield this.execute(
-          new ListObjectsV2Command({
+          new ListObjectsV2Command3({
             Bucket: this.bucket,
             Prefix: prefix,
             Delimiter: "/",
@@ -916,7 +1048,7 @@ var S3BucketUtil = class _S3BucketUtil {
               var _a3, _b2;
               return __spreadProps(__spreadValues({}, content), {
                 Name: (_b2 = (_a3 = content.Key) == null ? void 0 : _a3.replace(prefix, "")) != null ? _b2 : content.Key,
-                Location: `${this.link}${content.Key}`,
+                Location: content.Key ? `${this.link}${content.Key.replace(/^\//, "")}` : "",
                 LastModified: content.LastModified ? new Date(content.LastModified) : null
               });
             }
@@ -940,23 +1072,29 @@ var S3BucketUtil = class _S3BucketUtil {
       };
     });
   }
-  taggingFile(filePath, tagVersion = "1.0.0") {
+  // todo: checked!
+  taggingFile(filePath, tag) {
     return __async(this, null, function* () {
+      var _a2;
+      let normalizedKey = "";
+      const tags = [].concat(tag);
       try {
-        const normalizedKey = getNormalizedPath(filePath);
+        normalizedKey = getNormalizedPath(filePath);
         if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
         const command = new PutObjectTaggingCommand({
           Bucket: this.bucket,
           Key: normalizedKey,
-          Tagging: { TagSet: [{ Key: "version", Value: tagVersion }] }
+          Tagging: { TagSet: tags }
         });
         yield this.execute(command);
         return true;
-      } catch (e) {
+      } catch (error) {
+        (_a2 = this.logger) == null ? void 0 : _a2.warn(null, "failed to tagging file", { errMsg: error.message, fileKey: normalizedKey, tags });
         return false;
       }
     });
   }
+  // todo: checked!
   fileVersion(filePath) {
     return __async(this, null, function* () {
       var _a2, _b;
@@ -968,10 +1106,11 @@ var S3BucketUtil = class _S3BucketUtil {
       return (_b = tag == null ? void 0 : tag.Value) != null ? _b : "";
     });
   }
+  // todo: checked!
   fileUrl(filePath, expiresIn = "15m") {
     return __async(this, null, function* () {
       var _a2;
-      const normalizedKey = getNormalizedPath(filePath);
+      let normalizedKey = getNormalizedPath(filePath);
       if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
       const expiresInSeconds = typeof expiresIn === "number" ? expiresIn : ms(expiresIn) / 1e3;
       const command = new GetObjectCommand({ Bucket: this.bucket, Key: normalizedKey });
@@ -989,7 +1128,7 @@ var S3BucketUtil = class _S3BucketUtil {
       const normalizedKey = getNormalizedPath(filePath);
       if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
       try {
-        const command = new HeadObjectCommand({ Bucket: this.bucket, Key: normalizedKey });
+        const command = new HeadObjectCommand2({ Bucket: this.bucket, Key: normalizedKey });
         const headObject = yield this.execute(command);
         const bytes2 = (_a2 = headObject.ContentLength) != null ? _a2 : 0;
         switch (unit) {
@@ -1011,13 +1150,14 @@ var S3BucketUtil = class _S3BucketUtil {
       }
     });
   }
+  // todo: checked!
   fileExists(filePath) {
     return __async(this, null, function* () {
       var _a2;
       try {
         const normalizedKey = getNormalizedPath(filePath);
         if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
-        const command = new HeadObjectCommand({ Bucket: this.bucket, Key: normalizedKey });
+        const command = new HeadObjectCommand2({ Bucket: this.bucket, Key: normalizedKey });
         yield this.execute(command);
         return true;
       } catch (error) {
@@ -1028,9 +1168,10 @@ var S3BucketUtil = class _S3BucketUtil {
       }
     });
   }
+  // todo: checked!
   fileContent(filePath, format = "buffer") {
     return __async(this, null, function* () {
-      const normalizedKey = getNormalizedPath(filePath);
+      let normalizedKey = getNormalizedPath(filePath);
       if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
       const command = new GetObjectCommand({ Bucket: this.bucket, Key: normalizedKey });
       const result = yield this.execute(command);
@@ -1061,6 +1202,7 @@ var S3BucketUtil = class _S3BucketUtil {
       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);
@@ -1084,38 +1226,130 @@ var S3BucketUtil = class _S3BucketUtil {
       };
     });
   }
+  // todo: checked!
   deleteFile(filePath) {
     return __async(this, null, function* () {
       const normalizedKey = getNormalizedPath(filePath);
       if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
-      const command = new DeleteObjectCommand({ Bucket: this.bucket, Key: normalizedKey });
+      const command = new DeleteObjectCommand2({ Bucket: this.bucket, Key: normalizedKey });
       return yield this.execute(command);
     });
   }
-  // ##### STREAMING BLOCK ##########################
+};
+
+// src/aws/s3/s3-stream.ts
+var pump = promisify(pipeline);
+var S3Stream = class _S3Stream extends S3File {
+  constructor(_a2) {
+    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", ({
+      fileKey: _fileKey,
+      queryField = "file",
+      cachingAge = 31536e3
+    } = {}) => {
+      return (req, res, next) => __async(this, null, function* () {
+        var _a2, _b, _c, _d, _e;
+        let fileKey = _fileKey || (((_a2 = req.query) == null ? void 0 : _a2[queryField]) ? decodeURIComponent((_b = req.query) == null ? void 0 : _b[queryField]) : void 0);
+        if (!fileKey || fileKey === "/") {
+          (_d = this.logger) == null ? void 0 : _d.warn(req.id, "image file view required file query field", {
+            fileKey: (_c = req.query) == null ? void 0 : _c[queryField],
+            queryField
+          });
+          next("image file key is required");
+          return;
+        }
+        try {
+          const imageBuffer = yield this.fileContent(fileKey, "buffer");
+          const ext = path.extname(fileKey).slice(1).toLowerCase();
+          const mimeTypeMap = {
+            jpg: "image/jpeg",
+            jpeg: "image/jpeg",
+            png: "image/png",
+            gif: "image/gif",
+            webp: "image/webp",
+            svg: "image/svg+xml",
+            ico: "image/x-icon"
+          };
+          const contentType = mimeTypeMap[ext] || "application/octet-stream";
+          res.setHeader("Content-Type", contentType);
+          if (cachingAge) res.setHeader("Cache-Control", `public, max-age=${cachingAge}`);
+          res.setHeader("Content-Length", imageBuffer.length);
+          res.status(200).send(imageBuffer);
+        } catch (error) {
+          (_e = this.logger) == null ? void 0 : _e.warn(req.id, "image view fileKey not found", {
+            fileKey,
+            localstack: this.localstack
+          });
+          next(`Failed to retrieve image file: ${error.message}`);
+        }
+      });
+    });
+    // todo: LOCALSTACK SANITY CHECKED - WORKING WELL, DON'T TOUCH!
+    __publicField(this, "getPdfFileViewCtrl", ({
+      fileKey: _fileKey,
+      queryField = "file",
+      cachingAge = 31536e3
+    } = {}) => {
+      return (req, res, next) => __async(this, null, function* () {
+        var _a2, _b;
+        let fileKey = _fileKey || (((_a2 = req.query) == null ? void 0 : _a2[queryField]) ? decodeURIComponent((_b = req.query) == null ? void 0 : _b[queryField]) : void 0);
+        if (!fileKey) {
+          next("pdf file key is required");
+          return;
+        }
+        try {
+          const fileBuffer = yield this.fileContent(fileKey, "buffer");
+          const ext = path.extname(fileKey).slice(1).toLowerCase();
+          const mimeTypeMap = {
+            pdf: "application/pdf",
+            txt: "text/plain",
+            doc: "application/msword",
+            docx: "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+            xls: "application/vnd.ms-excel",
+            xlsx: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+            ppt: "application/vnd.ms-powerpoint",
+            pptx: "application/vnd.openxmlformats-officedocument.presentationml.presentation"
+          };
+          const contentType = mimeTypeMap[ext] || "application/octet-stream";
+          res.setHeader("Content-Type", contentType);
+          res.setHeader("Content-Disposition", `inline; filename="${path.basename(fileKey)}"`);
+          res.setHeader("Cache-Control", `public, max-age=${cachingAge}`);
+          res.setHeader("Content-Length", fileBuffer.length);
+          res.status(200).send(fileBuffer);
+        } catch (error) {
+          next(`Failed to retrieve pdf file: ${error.message}`);
+        }
+      });
+    });
+    this.maxUploadFileSizeRestriction = maxUploadFileSizeRestriction;
+  }
   streamObjectFile(_0) {
     return __async(this, arguments, function* (filePath, {
       Range,
       checkFileExists = true,
       abortSignal
     } = {}) {
-      const normalizedKey = getNormalizedPath(filePath);
+      let normalizedKey = getNormalizedPath(filePath);
       if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
       if (checkFileExists) {
         const isExists = yield this.fileExists(normalizedKey);
         if (!isExists) return null;
       }
-      const command = new GetObjectCommand(__spreadValues({
+      const command = new GetObjectCommand2(__spreadValues({
         Bucket: this.bucket,
         Key: normalizedKey
       }, Range ? { Range } : {}));
       const response = yield this.execute(command, { abortSignal });
-      if (!response.Body || !(response.Body instanceof Readable)) {
+      if (!response.Body || !(response.Body instanceof Readable2)) {
         throw new Error("Invalid response body: not a Readable stream");
       }
       return response.Body;
     });
   }
+  // todo: LOCALSTACK SANITY CHECKED - WORKING WELL, DON'T TOUCH!
   streamVideoFile(_0) {
     return __async(this, arguments, function* ({
       filePath,
@@ -1123,10 +1357,10 @@ var S3BucketUtil = class _S3BucketUtil {
       abortSignal
     }) {
       var _a2;
-      const normalizedKey = getNormalizedPath(filePath);
+      let normalizedKey = getNormalizedPath(filePath);
       if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
       try {
-        const cmd = new GetObjectCommand(__spreadValues({
+        const cmd = new GetObjectCommand2(__spreadValues({
           Bucket: this.bucket,
           Key: normalizedKey
         }, Range ? { Range } : {}));
@@ -1155,145 +1389,127 @@ var S3BucketUtil = class _S3BucketUtil {
       }
     });
   }
-  getStreamZipFileCtr(_0) {
+  // todo: LOCALSTACK SANITY CHECKED - WORKING WELL, DON'T TOUCH!
+  getStreamVideoFileCtrl(_0) {
     return __async(this, arguments, function* ({
-      filePath,
-      filename: _filename,
-      compressionLevel = 5
+      fileKey,
+      allowedWhitelist,
+      contentType = "video/mp4",
+      streamTimeoutMS = 3e4,
+      bufferMB = 5
     }) {
       return (req, res, next) => __async(this, null, function* () {
-        var _a2, _b, _c, _d, _e;
-        const filePaths = [].concat(filePath).map((filePath2) => getNormalizedPath(filePath2)).filter((v) => v && v !== "/");
-        if (!filePaths.length) {
-          throw new Error("No file keys provided");
+        var _a2, _b, _c, _d, _e, _f;
+        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;
+        }
+        try {
+          if (req.method === "HEAD") {
+            res.setHeader("Content-Type", contentType);
+            res.setHeader("Accept-Ranges", "bytes");
+            if (fileSize) res.setHeader("Content-Length", String(fileSize));
+            return res.status(200).end();
+          }
+          const bufferSize = bufferMB;
+          const CHUNK_SIZE = __pow(10, 6) * bufferSize;
+          const rangeValues = parseRangeHeader(req.headers.range, fileSize, CHUNK_SIZE);
+          let [start, end] = rangeValues || [];
+          if (!rangeValues || start < 0 || start >= fileSize || end < 0 || end >= fileSize || start > end) {
+            res.status(416).send("Requested Range Not Satisfiable");
+            return;
+          }
+          res.statusCode = 206;
+          const chunkLength = end - start + 1;
+          res.setHeader("Content-Length", chunkLength);
+          res.setHeader("Content-Range", `bytes ${start}-${end}/${fileSize}`);
+          res.setHeader("Accept-Ranges", "bytes");
+          res.setHeader("Content-Type", "video/mp4");
+          Range = `bytes=${start}-${end}`;
+        } catch (error) {
+          next(error);
+          return;
         }
-        let filename = _filename || (/* @__PURE__ */ new Date()).toISOString();
-        filename = filename.endsWith(".zip") ? filename : `${filename}.zip`;
         const abort = new AbortController();
-        const onClose = () => {
-          abort.abort();
-        };
+        const onClose = () => abort.abort();
         req.once("close", onClose);
         try {
-          (_a2 = this.logger) == null ? void 0 : _a2.info(this.reqId, "Starting parallel file download...", { fileCount: filePaths.length });
-          const downloadPromises = filePaths.map((filePath2) => __async(this, null, function* () {
-            var _a3, _b2, _c2;
-            try {
-              if (abort.signal.aborted) return null;
-              const stream = yield this.streamObjectFile(filePath2, { abortSignal: abort.signal });
-              if (!stream) {
-                (_a3 = this.logger) == null ? void 0 : _a3.warn(this.reqId, "File not found", { filePath: filePath2 });
-                return null;
-              }
-              const chunks = [];
-              try {
-                for (var iter = __forAwait(stream), more, temp, error; more = !(temp = yield iter.next()).done; more = false) {
-                  const chunk = temp.value;
-                  if (abort.signal.aborted) {
-                    stream.destroy();
-                    return null;
-                  }
-                  chunks.push(Buffer2.from(chunk));
-                }
-              } catch (temp) {
-                error = [temp];
-              } finally {
-                try {
-                  more && (temp = iter.return) && (yield temp.call(iter));
-                } finally {
-                  if (error)
-                    throw error[0];
-                }
-              }
-              const buffer = Buffer2.concat(chunks);
-              const fileName = filePath2.split("/").pop() || filePath2;
-              (_b2 = this.logger) == null ? void 0 : _b2.debug(this.reqId, "File downloaded", {
-                filePath: filePath2,
-                sizeMB: (buffer.length / (1024 * 1024)).toFixed(2)
-              });
-              return { buffer, name: fileName, path: filePath2 };
-            } catch (error2) {
-              (_c2 = this.logger) == null ? void 0 : _c2.warn(this.reqId, "Failed to download file", { filePath: filePath2, error: error2 });
-              return null;
-            }
-          }));
-          const fileBuffers = (yield Promise.all(downloadPromises)).filter(Boolean);
-          if (abort.signal.aborted || fileBuffers.length === 0) {
-            req.off("close", onClose);
-            if (fileBuffers.length === 0) {
-              next(new Error("No files available to zip"));
-            }
-            return;
-          }
-          (_b = this.logger) == null ? void 0 : _b.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)
-          });
-          const measureArchive = archiver("zip", { zlib: { level: compressionLevel } });
-          let actualZipSize = 0;
-          measureArchive.on("data", (chunk) => {
-            actualZipSize += chunk.length;
+          const result = yield this.streamVideoFile({
+            filePath: normalizedKey,
+            Range,
+            abortSignal: abort.signal
           });
-          for (const file of fileBuffers) {
-            if (abort.signal.aborted) break;
-            measureArchive.append(file.buffer, { name: file.name });
-          }
-          yield measureArchive.finalize();
-          if (abort.signal.aborted) {
-            req.off("close", onClose);
-            return;
+          const { body, meta } = result;
+          const origin = Array.isArray(allowedWhitelist) ? allowedWhitelist.includes((_a2 = req.headers.origin) != null ? _a2 : "") ? req.headers.origin : void 0 : allowedWhitelist;
+          if (origin) {
+            res.setHeader("Access-Control-Allow-Origin", origin);
+            res.setHeader("Vary", "Origin");
           }
-          (_c = this.logger) == null ? void 0 : _c.info(this.reqId, "Zip size calculated", {
-            actualZipSize,
-            sizeMB: (actualZipSize / (1024 * 1024)).toFixed(2)
-          });
-          const actualArchive = archiver("zip", { zlib: { level: compressionLevel } });
-          res.setHeader("Content-Type", "application/zip");
-          res.setHeader("Content-Disposition", `attachment; filename="${filename}"`);
-          res.setHeader("Content-Length", String(actualZipSize));
-          res.setHeader("Access-Control-Expose-Headers", "Content-Type, Content-Disposition, Content-Length");
-          actualArchive.on("error", (err) => {
-            var _a3;
-            (_a3 = this.logger) == null ? void 0 : _a3.error(this.reqId, "Archive error", { error: err });
-            abort.abort();
-            if (!res.headersSent) {
-              next(err);
+          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");
+          if (Range && meta.contentRange) {
+            res.status(206);
+            res.setHeader("Content-Range", meta.contentRange);
+            if (typeof meta.contentLength === "number") {
+              res.setHeader("Content-Length", String(meta.contentLength));
             }
-          });
-          actualArchive.pipe(res);
-          for (const file of fileBuffers) {
-            if (abort.signal.aborted) break;
-            actualArchive.append(file.buffer, { name: file.name });
+          } else if (fileSize) {
+            res.setHeader("Content-Length", String(fileSize));
           }
-          yield actualArchive.finalize();
-          (_d = this.logger) == null ? void 0 : _d.info(this.reqId, "Zip download completed", {
-            fileCount: fileBuffers.length,
-            totalSize: actualZipSize
+          if (meta.etag) res.setHeader("ETag", meta.etag);
+          if (meta.lastModified) res.setHeader("Last-Modified", meta.lastModified.toUTCString());
+          const timeout = setTimeout(() => {
+            abort.abort();
+            if (!res.headersSent) res.status(504);
+            res.end();
+          }, streamTimeoutMS);
+          res.once("close", () => {
+            var _a3;
+            clearTimeout(timeout);
+            (_a3 = body.destroy) == null ? void 0 : _a3.call(body);
+            req.off("close", onClose);
           });
-          req.off("close", onClose);
+          yield pump(body, res);
+          clearTimeout(timeout);
         } catch (error) {
-          abort.abort();
-          const isBenignError = (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 (isBenignError) {
+          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;
           }
           if (!res.headersSent) {
-            (_e = this.logger) == null ? void 0 : _e.error(this.reqId, "Failed to create zip archive", { error });
+            (_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),
+              key: fileKey,
+              url: req.originalUrl,
+              userId: (_e = req.user) == null ? void 0 : _e._id
+            });
             next(error);
-          } else if (!res.writableEnded) {
+            return;
+          }
+          if (!res.writableEnded) {
             try {
               res.end();
             } catch (e) {
             }
           }
-        } finally {
-          req.off("close", onClose);
+          return;
         }
       });
     });
   }
+  // todo: LOCALSTACK SANITY CHECKED - WORKING WELL, DON'T TOUCH!
   getStreamFileCtrl(_0) {
-    return __async(this, arguments, function* ({ filePath, filename }) {
+    return __async(this, arguments, function* ({
+      filePath,
+      filename,
+      forDownloading = false
+    }) {
       return (req, res, next) => __async(this, null, function* () {
         var _a2, _b;
         const abort = new AbortController();
@@ -1304,7 +1520,7 @@ var S3BucketUtil = class _S3BucketUtil {
           (_a3 = stream == null ? void 0 : stream.destroy) == null ? void 0 : _a3.call(stream);
         };
         req.once("close", onClose);
-        const normalizedKey = getNormalizedPath(filePath);
+        let normalizedKey = getNormalizedPath(filePath);
         if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
         try {
           const isExists = yield this.fileExists(normalizedKey);
@@ -1325,7 +1541,9 @@ var S3BucketUtil = class _S3BucketUtil {
           const fileInfo = yield this.fileInfo(normalizedKey);
           const fileName = filename || normalizedKey.split("/").pop() || "download";
           res.setHeader("Content-Type", fileInfo.ContentType || "application/octet-stream");
-          res.setHeader("Content-Disposition", `attachment; filename="${fileName}"`);
+          if (forDownloading) {
+            res.setHeader("Content-Disposition", `attachment; filename="${fileName}"`);
+          }
           if (fileInfo.ContentLength) {
             res.setHeader("Content-Length", String(fileInfo.ContentLength));
           }
@@ -1366,115 +1584,140 @@ var S3BucketUtil = class _S3BucketUtil {
       });
     });
   }
-  getStreamVideoFileCtrl(_0) {
+  // todo: LOCALSTACK SANITY CHECKED - WORKING WELL, DON'T TOUCH!
+  getStreamZipFileCtr(_0) {
     return __async(this, arguments, function* ({
-      fileKey,
-      allowedWhitelist,
-      contentType = "video/mp4",
-      streamTimeoutMS = 3e4,
-      bufferMB = 5
+      filePath,
+      filename: _filename,
+      compressionLevel = 5
     }) {
       return (req, res, next) => __async(this, null, function* () {
-        var _a2, _b, _c, _d, _e, _f;
-        const 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;
-        }
-        try {
-          if (req.method === "HEAD") {
-            res.setHeader("Content-Type", contentType);
-            res.setHeader("Accept-Ranges", "bytes");
-            if (fileSize) res.setHeader("Content-Length", String(fileSize));
-            return res.status(200).end();
-          }
-          const bufferSize = bufferMB;
-          const CHUNK_SIZE = __pow(10, 6) * bufferSize;
-          const rangeValues = parseRangeHeader(req.headers.range, fileSize, CHUNK_SIZE);
-          let [start, end] = rangeValues || [];
-          if (!rangeValues || start < 0 || start >= fileSize || end < 0 || end >= fileSize || start > end) {
-            res.status(416).send("Requested Range Not Satisfiable");
-            return;
-          }
-          res.statusCode = 206;
-          const chunkLength = end - start + 1;
-          res.setHeader("Content-Length", chunkLength);
-          res.setHeader("Content-Range", `bytes ${start}-${end}/${fileSize}`);
-          res.setHeader("Accept-Ranges", "bytes");
-          res.setHeader("Content-Type", "video/mp4");
-          Range = `bytes=${start}-${end}`;
-        } catch (error) {
-          next(error);
-          return;
+        var _a2, _b, _c, _d, _e;
+        const filePaths = [].concat(filePath).map((filePath2) => getNormalizedPath(filePath2)).filter((v) => v && v !== "/");
+        if (!filePaths.length) {
+          throw new Error("No file keys provided");
         }
+        let filename = _filename || (/* @__PURE__ */ new Date()).toISOString();
+        filename = filename.endsWith(".zip") ? filename : `${filename}.zip`;
         const abort = new AbortController();
-        const onClose = () => abort.abort();
+        const onClose = () => {
+          abort.abort();
+        };
         req.once("close", onClose);
         try {
-          const result = yield this.streamVideoFile({
-            filePath: normalizedKey,
-            Range,
-            abortSignal: abort.signal
+          (_a2 = this.logger) == null ? void 0 : _a2.info(this.reqId, "Starting parallel file download...", { fileCount: filePaths.length });
+          const downloadPromises = filePaths.map((filePath2) => __async(this, null, function* () {
+            var _a3, _b2, _c2;
+            try {
+              if (abort.signal.aborted) return null;
+              const stream = yield this.streamObjectFile(filePath2, { abortSignal: abort.signal });
+              if (!stream) {
+                (_a3 = this.logger) == null ? void 0 : _a3.warn(this.reqId, "File not found", { filePath: filePath2 });
+                return null;
+              }
+              const chunks = [];
+              try {
+                for (var iter = __forAwait(stream), more, temp, error; more = !(temp = yield iter.next()).done; more = false) {
+                  const chunk = temp.value;
+                  if (abort.signal.aborted) {
+                    stream.destroy();
+                    return null;
+                  }
+                  chunks.push(Buffer3.from(chunk));
+                }
+              } catch (temp) {
+                error = [temp];
+              } finally {
+                try {
+                  more && (temp = iter.return) && (yield temp.call(iter));
+                } finally {
+                  if (error)
+                    throw error[0];
+                }
+              }
+              const buffer = Buffer3.concat(chunks);
+              const fileName = filePath2.split("/").pop() || filePath2;
+              (_b2 = this.logger) == null ? void 0 : _b2.debug(this.reqId, "File downloaded", {
+                filePath: filePath2,
+                sizeMB: (buffer.length / (1024 * 1024)).toFixed(2)
+              });
+              return { buffer, name: fileName, path: filePath2 };
+            } catch (error2) {
+              (_c2 = this.logger) == null ? void 0 : _c2.warn(this.reqId, "Failed to download file", { filePath: filePath2, error: error2 });
+              return null;
+            }
+          }));
+          const fileBuffers = (yield Promise.all(downloadPromises)).filter(Boolean);
+          if (abort.signal.aborted || fileBuffers.length === 0) {
+            req.off("close", onClose);
+            if (fileBuffers.length === 0) {
+              next(new Error("No files available to zip"));
+            }
+            return;
+          }
+          (_b = this.logger) == null ? void 0 : _b.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)
           });
-          const { body, meta } = result;
-          const origin = Array.isArray(allowedWhitelist) ? allowedWhitelist.includes((_a2 = req.headers.origin) != null ? _a2 : "") ? req.headers.origin : void 0 : allowedWhitelist;
-          if (origin) {
-            res.setHeader("Access-Control-Allow-Origin", origin);
-            res.setHeader("Vary", "Origin");
+          const measureArchive = archiver("zip", { zlib: { level: compressionLevel } });
+          let actualZipSize = 0;
+          measureArchive.on("data", (chunk) => {
+            actualZipSize += chunk.length;
+          });
+          for (const file of fileBuffers) {
+            if (abort.signal.aborted) break;
+            measureArchive.append(file.buffer, { name: file.name });
           }
-          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");
-          if (Range && meta.contentRange) {
-            res.status(206);
-            res.setHeader("Content-Range", meta.contentRange);
-            if (typeof meta.contentLength === "number") {
-              res.setHeader("Content-Length", String(meta.contentLength));
-            }
-          } else if (fileSize) {
-            res.setHeader("Content-Length", String(fileSize));
+          yield measureArchive.finalize();
+          if (abort.signal.aborted) {
+            req.off("close", onClose);
+            return;
           }
-          if (meta.etag) res.setHeader("ETag", meta.etag);
-          if (meta.lastModified) res.setHeader("Last-Modified", meta.lastModified.toUTCString());
-          const timeout = setTimeout(() => {
-            abort.abort();
-            if (!res.headersSent) res.status(504);
-            res.end();
-          }, streamTimeoutMS);
-          res.once("close", () => {
+          (_c = this.logger) == null ? void 0 : _c.info(this.reqId, "Zip size calculated", {
+            actualZipSize,
+            sizeMB: (actualZipSize / (1024 * 1024)).toFixed(2)
+          });
+          const actualArchive = archiver("zip", { zlib: { level: compressionLevel } });
+          res.setHeader("Content-Type", "application/zip");
+          res.setHeader("Content-Disposition", `attachment; filename="${filename}"`);
+          res.setHeader("Content-Length", String(actualZipSize));
+          res.setHeader("Access-Control-Expose-Headers", "Content-Type, Content-Disposition, Content-Length");
+          actualArchive.on("error", (err) => {
             var _a3;
-            clearTimeout(timeout);
-            (_a3 = body.destroy) == null ? void 0 : _a3.call(body);
-            req.off("close", onClose);
+            (_a3 = this.logger) == null ? void 0 : _a3.error(this.reqId, "Archive error", { error: err });
+            abort.abort();
+            if (!res.headersSent) {
+              next(err);
+            }
           });
-          yield pump(body, res);
-          clearTimeout(timeout);
+          actualArchive.pipe(res);
+          for (const file of fileBuffers) {
+            if (abort.signal.aborted) break;
+            actualArchive.append(file.buffer, { name: file.name });
+          }
+          yield actualArchive.finalize();
+          (_d = this.logger) == null ? void 0 : _d.info(this.reqId, "Zip download completed", {
+            fileCount: fileBuffers.length,
+            totalSize: actualZipSize
+          });
+          req.off("close", onClose);
         } catch (error) {
-          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) {
+          abort.abort();
+          const isBenignError = (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 (isBenignError) {
             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),
-              key: fileKey,
-              url: req.originalUrl,
-              userId: (_e = req.user) == null ? void 0 : _e._id
-            });
+            (_e = this.logger) == null ? void 0 : _e.error(this.reqId, "Failed to create zip archive", { error });
             next(error);
-            return;
-          }
-          if (!res.writableEnded) {
+          } else if (!res.writableEnded) {
             try {
               res.end();
             } catch (e) {
             }
           }
-          return;
+        } finally {
+          req.off("close", onClose);
         }
       });
     });
@@ -1492,19 +1735,6 @@ var S3BucketUtil = class _S3BucketUtil {
       return cb(new Error(errorMsg));
     };
   }
-  getFileSize(maxFileSize) {
-    var _a2;
-    const fileSizeUnitValue = maxFileSize != null ? maxFileSize : this.maxUploadFileSizeRestriction;
-    const fileSize = typeof fileSizeUnitValue === "number" ? fileSizeUnitValue : bytes(fileSizeUnitValue);
-    if (!fileSize) {
-      (_a2 = this.logger) == null ? void 0 : _a2.warn(this.reqId, "Failed to convert fileSize restriction, proceeding without limit", {
-        maxFileSize,
-        maxUploadFileSizeRestriction: this.maxUploadFileSizeRestriction
-      });
-      return void 0;
-    }
-    return fileSize;
-  }
   getUploadFileMW(directoryPath, {
     acl = "private" /* private */,
     maxFileSize,
@@ -1516,10 +1746,10 @@ var S3BucketUtil = class _S3BucketUtil {
     let normalizedPath = getNormalizedPath(directoryPath);
     if (normalizedPath !== "/" && directoryPath !== "" && directoryPath !== void 0) normalizedPath += "/";
     else normalizedPath = "";
-    const fileSize = this.getFileSize(maxFileSize);
+    const fileSize = getFileSize(maxFileSize, this.maxUploadFileSizeRestriction);
     const fileTypes = [].concat(fileType);
     const fileExts = [].concat(fileExt);
-    const fileFilter = (fileTypes == null ? void 0 : fileTypes.length) || (fileExts == null ? void 0 : fileExts.length) ? _S3BucketUtil.fileFilter(fileTypes, fileExts) : void 0;
+    const fileFilter = (fileTypes == null ? void 0 : fileTypes.length) || (fileExts == null ? void 0 : fileExts.length) ? _S3Stream.fileFilter(fileTypes, fileExts) : void 0;
     return multer({
       fileFilter,
       limits: __spreadValues({}, fileSize && { fileSize }),
@@ -1556,14 +1786,19 @@ var S3BucketUtil = class _S3BucketUtil {
    * Middleware for uploading a single file
    * Adds the uploaded file info to req.s3File
    */
-  uploadSingleFile(fieldName, directory, options = {}) {
-    const upload = this.getUploadFileMW(directory, options);
+  uploadSingleFile(fieldName, directoryPath, options = {}) {
+    var _a2;
+    let normalizedPath = getNormalizedPath(directoryPath);
+    if (normalizedPath !== "/" && directoryPath !== "" && directoryPath !== void 0) normalizedPath += "/";
+    else normalizedPath = "";
+    (_a2 = this.logger) == null ? void 0 : _a2.debug(null, "####### uploadSingleFile", { directoryPath, normalizedPath, fieldName });
+    const upload = this.getUploadFileMW(normalizedPath, options);
     return (req, res, next) => {
       const mw = upload.single(fieldName);
       mw(req, res, (err) => {
-        var _a2, _b;
+        var _a3, _b;
         if (err) {
-          (_a2 = this.logger) == null ? void 0 : _a2.error(this.reqId, "Single file upload error", { fieldName, error: err.message });
+          (_a3 = this.logger) == null ? void 0 : _a3.error(this.reqId, "Single file upload error", { fieldName, error: err.message });
           return next(err);
         }
         if (req.file) {
@@ -1583,8 +1818,11 @@ var S3BucketUtil = class _S3BucketUtil {
    * Middleware for uploading multiple files with the same field name
    * Adds the uploaded files info to req.s3Files
    */
-  uploadMultipleFiles(fieldName, directory, options = {}) {
-    const upload = this.getUploadFileMW(directory, options);
+  uploadMultipleFiles(fieldName, directoryPath, options = {}) {
+    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);
       mw(req, res, (err) => {
@@ -1605,49 +1843,15 @@ var S3BucketUtil = class _S3BucketUtil {
       });
     };
   }
-  /**
-   * Middleware for uploading multiple files with different field names
-   * Adds the uploaded files info to req.s3FilesByField
-   */
-  uploadFieldsFiles(fields) {
-    const fieldConfigs = fields.map((field) => {
-      const upload = this.getUploadFileMW(field.directory, field.options || {});
-      return {
-        name: field.name,
-        maxCount: field.maxCount || 1,
-        upload,
-        directory: field.directory
-      };
-    });
-    return (req, res, next) => __async(this, null, function* () {
-      const multerFields = fieldConfigs.map((f) => ({ name: f.name, maxCount: f.maxCount }));
-      const upload = this.getUploadFileMW(fieldConfigs[0].directory);
-      const mw = upload.fields(multerFields);
-      mw(req, res, (err) => {
-        var _a2, _b;
-        if (err) {
-          (_a2 = this.logger) == null ? void 0 : _a2.error(this.reqId, "Fields upload error", { error: err.message });
-          return next(err);
-        }
-        if (req.files && typeof req.files === "object" && !Array.isArray(req.files)) {
-          req.s3FilesByField = req.files;
-          const uploadSummary = Object.entries(req.s3FilesByField).map(([field, files]) => ({
-            field,
-            count: files.length,
-            keys: files.map((f) => f.key)
-          }));
-          (_b = this.logger) == null ? void 0 : _b.info(this.reqId, "Fields uploaded successfully", { uploadSummary });
-        }
-        next();
-      });
-    });
-  }
   /**
    * Middleware for uploading any files (mixed field names)
    * Adds the uploaded files info to req.s3AllFiles
    */
-  uploadAnyFiles(directory, maxCount, options = {}) {
-    const upload = this.getUploadFileMW(directory, options);
+  uploadAnyFiles(directoryPath, maxCount, options = {}) {
+    let normalizedPath = getNormalizedPath(directoryPath);
+    if (normalizedPath !== "/" && normalizedPath !== "" && directoryPath !== void 0) normalizedPath += "/";
+    else normalizedPath = "";
+    const upload = this.getUploadFileMW(normalizedPath, options);
     return (req, res, next) => {
       const anyUpload = maxCount ? upload.any() : upload.any();
       anyUpload(req, res, (err) => {
@@ -1670,6 +1874,159 @@ var S3BucketUtil = class _S3BucketUtil {
       });
     };
   }
+  /**
+   * Middleware for uploading multiple files with different field names
+   * Adds the uploaded files info to req.s3FilesByField
+   */
+  // uploadFieldsFiles(
+  //     fields: Array<{ name: string; directory: string; maxCount?: number; options?: S3UploadOptions }>
+  // ): RequestHandler {
+  //     // Create separate multer instances for each field (since each might have different options)
+  //     const fieldConfigs = fields.map((field) => {
+  //         const upload = this.getUploadFileMW(field.directory, field.options || {});
+  //
+  //         return {
+  //             name: getNormalizedPath(field.name),
+  //             directory: getNormalizedPath(field.directory),
+  //             maxCount: field.maxCount || 1,
+  //             upload,
+  //         };
+  //     });
+  //
+  //     return async (
+  //         req: Request & { s3FilesByField?: Record<string, UploadedS3File[]> } & any,
+  //         res: Response,
+  //         next: NextFunction & any
+  //     ) => {
+  //         // We'll use the first upload instance but with fields configuration
+  //         const multerFields = fieldConfigs.map((f) => ({ name: f.name, maxCount: f.maxCount }));
+  //         const upload = this.getUploadFileMW(fieldConfigs[0].directory);
+  //
+  //         const mw: RequestHandler & any = upload.fields(multerFields);
+  //         mw(req, res, (err: any) => {
+  //             if (err) {
+  //                 this.logger?.error(this.reqId, 'Fields upload error', { error: err.message });
+  //                 return next(err);
+  //             }
+  //
+  //             if (req.files && typeof req.files === 'object' && !Array.isArray(req.files)) {
+  //                 req.s3FilesByField = req.files as Record<string, UploadedS3File[]>;
+  //
+  //                 const uploadSummary = Object.entries(req.s3FilesByField).map(([field, files]: any) => ({
+  //                     field,
+  //                     count: files.length,
+  //                     keys: files.map((f: any) => f.key),
+  //                 }));
+  //
+  //                 this.logger?.info(this.reqId, 'Fields uploaded successfully', { uploadSummary });
+  //             }
+  //
+  //             next();
+  //         });
+  //     };
+  // }
+};
+
+// src/aws/s3/s3-util.ts
+var S3Util = class extends S3Stream {
+  constructor(props) {
+    super(props);
+  }
+};
+
+// src/aws/s3/s3-util.localstack.ts
+var S3LocalstackUtil = class extends S3Util {
+  constructor(props) {
+    super(__spreadProps(__spreadValues({}, props), { localstack: true }));
+  }
+  // todo: checked!
+  directoryList(directoryPath) {
+    return __async(this, null, function* () {
+      var _a2;
+      let normalizedPath = getNormalizedPath(directoryPath);
+      if (normalizedPath !== "/" && directoryPath !== "" && directoryPath !== void 0) normalizedPath += "/";
+      else normalizedPath = "";
+      let result;
+      result = yield this.execute(
+        new ListObjectsV2Command4({
+          Bucket: this.bucket,
+          Prefix: normalizedPath,
+          Delimiter: "/"
+        })
+      );
+      (_a2 = this.logger) == null ? void 0 : _a2.debug(null, "#### directoryList", {
+        normalizedPath,
+        CommonPrefixes: result.CommonPrefixes,
+        ContentFile: result.Contents
+      });
+      const directories = (result.CommonPrefixes || []).map((prefix) => prefix.Prefix).map((prefix) => {
+        const relativePath = prefix.replace(normalizedPath, "");
+        const dir = relativePath.replace(/\/$/, "");
+        return dir;
+      }).filter((dir) => dir);
+      const files = (result.Contents || []).filter((content) => {
+        var _a3;
+        return content.Key !== normalizedPath && !((_a3 = content.Key) == null ? void 0 : _a3.endsWith("/"));
+      }).map((content) => __spreadProps(__spreadValues({}, content), {
+        Name: content.Key.replace(normalizedPath, "") || content.Key,
+        Location: `${this.link}${content.Key.replace(/^\//, "")}`,
+        LastModified: new Date(content.LastModified)
+      }));
+      return { directories, files };
+    });
+  }
+  // todo: checked!
+  directoryListPaginated(_0) {
+    return __async(this, arguments, function* (directoryPath, {
+      pageSize = 100,
+      pageNumber = 0
+      // 0-based: page 0 = items 0-99, page 1 = items 100-199, page 2 = items 200-299
+    } = {}) {
+      let normalizedPath = getNormalizedPath(directoryPath);
+      if (normalizedPath !== "/" && directoryPath !== "" && directoryPath !== void 0) normalizedPath += "/";
+      else normalizedPath = this.localstack ? "" : "/";
+      let continuationToken = void 0;
+      let currentPage = 0;
+      let allDirectories = [];
+      let allFiles = [];
+      while (currentPage <= pageNumber) {
+        let result;
+        result = yield this.execute(
+          new ListObjectsV2Command4({
+            Bucket: this.bucket,
+            Prefix: normalizedPath,
+            Delimiter: "/",
+            MaxKeys: pageSize,
+            ContinuationToken: continuationToken
+          })
+        );
+        if (currentPage === pageNumber) {
+          allDirectories = (result.CommonPrefixes || []).map((prefix) => prefix.Prefix).map((prefix) => {
+            const relativePath = prefix.replace(normalizedPath, "");
+            return relativePath.replace(/\/$/, "");
+          }).filter((dir) => dir);
+          allFiles = (result.Contents || []).filter((content) => {
+            var _a2;
+            return content.Key !== normalizedPath && !((_a2 = content.Key) == null ? void 0 : _a2.endsWith("/"));
+          }).map((content) => __spreadProps(__spreadValues({}, content), {
+            Name: content.Key.replace(normalizedPath, "") || content.Key,
+            Location: `${this.link}${content.Key.replace(/^\//, "")}`,
+            LastModified: new Date(content.LastModified)
+          }));
+        }
+        continuationToken = result.NextContinuationToken;
+        if (!result.IsTruncated || !continuationToken) {
+          break;
+        }
+        currentPage++;
+      }
+      return {
+        directories: allDirectories,
+        files: allFiles,
+        totalFetched: allFiles.length + allDirectories.length
+      };
+    });
+  }
 };
 
 // src/aws/sns.ts
@@ -1707,6 +2064,7 @@ export {
   AWSConfigSharingUtil,
   IAMUtil,
   LambdaUtil,
-  S3BucketUtil,
+  S3LocalstackUtil,
+  S3Util,
   SNSUtil
 };