@hdriel/aws-utils 1.2.3 → 1.3.0

package/dist/index.cjs

@@ -85,16 +85,19 @@ var index_exports = {};
 __export(index_exports, {
   ACLs: () => ACLs,
   AWSConfigSharingUtil: () => AWSConfigSharingUtil,
-  IAMUtil: () => IAMUtil,
+  IamUtil: () => IamUtil,
   LambdaUtil: () => LambdaUtil,
   S3LocalstackUtil: () => S3LocalstackUtil,
   S3Util: () => S3Util,
-  SNSUtil: () => SNSUtil,
-  SUPPORTED_IFRAME_EXTENSIONS: () => SUPPORTED_IFRAME_EXTENSIONS
+  SUPPORTED_IFRAME_EXTENSIONS: () => SUPPORTED_IFRAME_EXTENSIONS,
+  SnsUtil: () => SnsUtil
 });
 module.exports = __toCommonJS(index_exports);
 
-// src/aws/iam.ts
+// src/aws/iam/iam-commands.ts
+var import_client_iam2 = require("@aws-sdk/client-iam");
+
+// src/aws/iam/iam-base.ts
 var import_client_iam = require("@aws-sdk/client-iam");
 
 // src/aws/configuration.ts
@@ -127,149 +130,159 @@ __publicField(_AWSConfigSharingUtil, "endpoint");
 __publicField(_AWSConfigSharingUtil, "region");
 var AWSConfigSharingUtil = _AWSConfigSharingUtil;
 
-// src/aws/iam.ts
-var IAMUtil = class {
+// src/aws/iam/iam-base.ts
+var IamBase = class {
   constructor({
+    logger,
+    reqId,
     accessKeyId = AWSConfigSharingUtil.accessKeyId,
     secretAccessKey = AWSConfigSharingUtil.secretAccessKey,
     endpoint = AWSConfigSharingUtil.endpoint,
-    region = AWSConfigSharingUtil.region,
-    debug = false
-  } = {}) {
+    region = AWSConfigSharingUtil.region
+  }) {
     __publicField(this, "iam");
+    __publicField(this, "endpoint");
+    __publicField(this, "region");
+    __publicField(this, "logger");
+    __publicField(this, "reqId");
     const credentials = { accessKeyId, secretAccessKey };
     const options = __spreadValues(__spreadValues(__spreadValues({}, accessKeyId && secretAccessKey && { credentials }), endpoint && { endpoint }), region && { region });
-    if (debug) {
-      console.log("IAMUtil client options", options);
-    }
+    this.endpoint = endpoint;
+    this.region = region;
+    this.logger = logger;
+    this.reqId = reqId != null ? reqId : null;
     this.iam = new import_client_iam.IAMClient(options);
   }
-  get client() {
-    return this.iam;
-  }
-  getUserList() {
+  execute(command, options) {
     return __async(this, null, function* () {
-      const command = new import_client_iam.ListUsersCommand({});
-      return this.iam.send(command);
+      return this.iam.send(command, options);
     });
   }
+};
+
+// src/aws/iam/iam-commands.ts
+var IamCommands = class extends IamBase {
+  constructor(_a) {
+    var props = __objRest(_a, []);
+    super(props);
+  }
   listUsers(maxItems) {
     return __async(this, null, function* () {
       try {
-        const command = new import_client_iam.ListUsersCommand({ MaxItems: maxItems });
-        const response = yield this.iam.send(command);
+        const command = new import_client_iam2.ListUsersCommand({ MaxItems: maxItems });
+        const response = yield this.execute(command);
         return response.Users;
       } catch (error) {
-        console.error("Error listing IAM users:", error);
+        console.error("Error IAM users list:", error);
         return null;
       }
     });
   }
 };
 
-// src/aws/lambda.ts
-var import_client_lambda = require("@aws-sdk/client-lambda");
+// src/aws/iam/iam-util.ts
+var IamUtil = class extends IamCommands {
+  constructor(props) {
+    super(props);
+  }
+  get client() {
+    return this.iam;
+  }
+};
 
-// src/utils/logger.ts
-var import_stack_trace_logger = require("stack-trace-logger");
-var includeCloudWatchOptions = process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY && process.env.AWS_REGION && process.env.AWS_LOG_GROUP_NAME && process.env.AWS_LOG_STREAM_NAME;
-var _a;
-var logger = new import_stack_trace_logger.Logger(__spreadValues({
-  serviceName: process.env.SERVICE_NAME || "SERVER",
-  loggingModeLevel: process.env.LOGGING_MODE,
-  lineTraceLevels: (_a = process.env.LOGGING_STACK_TRACE_LEVELS) == null ? void 0 : _a.split(","),
-  stackTraceLines: { error: 3, warn: 3, info: 1 },
-  tags: ["reqId?", "url?"],
-  runLocally: true
-}, includeCloudWatchOptions && {
-  transportCloudWatchOptions: {
-    awsAccessKeyId: process.env.AWS_ACCESS_KEY_ID,
-    awsSecretKey: process.env.AWS_SECRET_ACCESS_KEY,
-    awsRegion: process.env.AWS_REGION,
-    logGroupName: process.env.AWS_LOG_GROUP_NAME,
-    logStreamName: process.env.AWS_LOG_STREAM_NAME,
-    retentionInDays: +process.env.AWS_LOG_RETENTION_IN_DAY
-  }
-}));
+// src/aws/lambda/lambda-events.ts
+var import_client_lambda2 = require("@aws-sdk/client-lambda");
 
-// src/aws/lambda.ts
-var LambdaUtil = class {
+// src/aws/lambda/lambda-base.ts
+var import_client_lambda = require("@aws-sdk/client-lambda");
+var LambdaBase = class {
   constructor({
+    logger,
+    reqId,
     accessKeyId = AWSConfigSharingUtil.accessKeyId,
     secretAccessKey = AWSConfigSharingUtil.secretAccessKey,
     endpoint = AWSConfigSharingUtil.endpoint,
-    region = AWSConfigSharingUtil.region,
-    serviceFunctionName,
-    debug = false
+    region = AWSConfigSharingUtil.region
   }) {
     __publicField(this, "lambda");
-    __publicField(this, "serviceFunctionName");
+    __publicField(this, "endpoint");
+    __publicField(this, "region");
+    __publicField(this, "logger");
+    __publicField(this, "reqId");
     const credentials = { accessKeyId, secretAccessKey };
     const options = __spreadValues(__spreadValues(__spreadValues({}, accessKeyId && secretAccessKey && { credentials }), endpoint && { endpoint }), region && { region });
-    if (debug) {
-      console.log("LambdaUtil client options", options);
-    }
+    this.endpoint = endpoint;
+    this.region = region;
+    this.logger = logger;
+    this.reqId = reqId != null ? reqId : null;
+    this.lambda = new import_client_lambda.Lambda(__spreadValues({}, options));
+  }
+};
+
+// src/aws/lambda/lambda-events.ts
+var LambdaEvents = class extends LambdaBase {
+  constructor(_a) {
+    var _b = _a, { serviceFunctionName } = _b, props = __objRest(_b, ["serviceFunctionName"]);
+    super(props);
+    __publicField(this, "serviceFunctionName");
     this.serviceFunctionName = serviceFunctionName;
-    this.lambda = new import_client_lambda.Lambda(__spreadValues(__spreadValues(__spreadValues({}, credentials && { credentials }), endpoint && { endpoint }), region && { region }));
   }
   directInvoke(_0) {
     return __async(this, arguments, function* ({
       payload = {},
-      invocationType = import_client_lambda.InvocationType.Event
+      invocationType = import_client_lambda2.InvocationType.Event
     }) {
-      var _a2;
+      var _a, _b, _c;
+      const FunctionName = this.serviceFunctionName;
       const Payload = JSON.stringify(payload);
       try {
-        const command = new import_client_lambda.InvokeCommand({
-          FunctionName: this.serviceFunctionName,
-          Payload,
-          InvocationType: invocationType
-        });
+        const command = new import_client_lambda2.InvokeCommand({ FunctionName, Payload, InvocationType: invocationType });
         const data = yield this.lambda.send(command);
-        if (invocationType === import_client_lambda.InvocationType.RequestResponse) {
-          logger.info(null, "directInvoke lambda function response", { FunctionName, data });
+        if (invocationType === import_client_lambda2.InvocationType.RequestResponse) {
+          (_a = this.logger) == null ? void 0 : _a.debug(null, "directInvoke lambda function response", {
+            FunctionName,
+            data,
+            InvocationType: import_client_lambda2.InvocationType
+          });
         }
-        const status = (_a2 = data.StatusCode) != null ? _a2 : 200;
+        const status = (_b = data.StatusCode) != null ? _b : 200;
         const result = data.Payload;
         return status >= 200 && status < 300 ? result : Promise.reject(result);
       } catch (err) {
-        logger.error(null, "failed to directInvoke lambda function", {
-          err,
-          Payload,
-          FunctionName
-        });
+        (_c = this.logger) == null ? void 0 : _c.error(null, "failed to directInvoke lambda function", { err, Payload, FunctionName });
         throw err;
       }
     });
   }
   runLambdaInDryRunMode(payload) {
     return __async(this, null, function* () {
-      return this.directInvoke({
-        payload,
-        invocationType: import_client_lambda.InvocationType.DryRun
-      });
+      return this.directInvoke({ payload, invocationType: import_client_lambda2.InvocationType.DryRun });
     });
   }
   triggerLambdaEvent(payload) {
     return __async(this, null, function* () {
-      return this.directInvoke({
-        payload,
-        invocationType: import_client_lambda.InvocationType.Event
-      });
+      return this.directInvoke({ payload, invocationType: import_client_lambda2.InvocationType.Event });
     });
   }
   runAndGetLambdaResponse(payload) {
     return __async(this, null, function* () {
-      return this.directInvoke({
-        payload,
-        invocationType: import_client_lambda.InvocationType.RequestResponse
-      });
+      return this.directInvoke({ payload, invocationType: import_client_lambda2.InvocationType.RequestResponse });
     });
   }
 };
 
+// src/aws/lambda/lambda-util.ts
+var LambdaUtil = class extends LambdaEvents {
+  constructor(props) {
+    super(props);
+  }
+  get client() {
+    return this.lambda;
+  }
+};
+
 // src/aws/s3/s3-util.localstack.ts
-var import_client_s36 = require("@aws-sdk/client-s3");
+var import_client_s37 = require("@aws-sdk/client-s3");
 
 // src/aws/s3/s3-stream.ts
 var import_pathe2 = require("pathe");
@@ -395,8 +408,8 @@ 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 : "";
+  var _a;
+  const fileSizeUnitValue = (_a = maxFileSize != null ? maxFileSize : defaultMaxFileSize) != null ? _a : "";
   const fileSize = typeof fileSizeUnitValue === "number" ? fileSizeUnitValue : (0, import_bytes.default)(fileSizeUnitValue);
   return fileSize != null ? fileSize : void 0;
 };
@@ -453,7 +466,7 @@ var import_node_http_handler = require("@smithy/node-http-handler");
 var import_client_s3 = require("@aws-sdk/client-s3");
 var S3Base = class {
   constructor({
-    logger: logger2,
+    logger,
     reqId,
     accessKeyId = AWSConfigSharingUtil.accessKeyId,
     secretAccessKey = AWSConfigSharingUtil.secretAccessKey,
@@ -473,7 +486,7 @@ var S3Base = class {
     const options = __spreadValues(__spreadValues(__spreadValues({}, accessKeyId && secretAccessKey && { credentials }), endpoint && { endpoint }), region && { region });
     this.endpoint = endpoint;
     this.region = region;
-    this.logger = logger2;
+    this.logger = logger;
     this.reqId = reqId != null ? reqId : null;
     this.localstack = localstack;
     const s3ClientParams = __spreadProps(__spreadValues(__spreadValues({}, options), s3ForcePathStyle && { forcePathStyle: s3ForcePathStyle }), {
@@ -495,8 +508,8 @@ var S3Base = class {
 
 // src/aws/s3/s3-bucket.ts
 var S3Bucket = class extends S3Base {
-  constructor(_a2) {
-    var _b = _a2, { bucket } = _b, props = __objRest(_b, ["bucket"]);
+  constructor(_a) {
+    var _b = _a, { bucket } = _b, props = __objRest(_b, ["bucket"]);
     super(props);
     __publicField(this, "_bucket");
     __publicField(this, "initializedBucket", "");
@@ -538,13 +551,13 @@ var S3Bucket = class extends S3Base {
   }
   isBucketExists() {
     return __async(this, null, function* () {
-      var _a2, _b;
+      var _a, _b;
       const bucketName = this.bucket;
       try {
         yield this.execute(new import_client_s32.HeadBucketCommand({ Bucket: bucketName }));
         return true;
       } catch (err) {
-        if (err.name !== "NotFound" && ((_a2 = err.$metadata) == null ? void 0 : _a2.httpStatusCode) !== 404) {
+        if (err.name !== "NotFound" && ((_a = err.$metadata) == null ? void 0 : _a.httpStatusCode) !== 404) {
           (_b = this.logger) == null ? void 0 : _b.error(this.reqId, "Error checking bucket:", err);
           throw err;
         } else {
@@ -555,11 +568,11 @@ var S3Bucket = class extends S3Base {
   }
   initAsPublicBucket() {
     return __async(this, null, function* () {
-      var _a2, _b;
+      var _a, _b;
       const bucketName = this.bucket;
       const isExists = yield this.isBucketExists();
       if (isExists) {
-        (_a2 = this.logger) == null ? void 0 : _a2.info(this.reqId, `Bucket already exists.`, { bucketName });
+        (_a = this.logger) == null ? void 0 : _a.info(this.reqId, `Bucket already exists.`, { bucketName });
         return;
       }
       const data = yield this.execute(new import_client_s32.CreateBucketCommand({ Bucket: bucketName }));
@@ -597,11 +610,11 @@ var S3Bucket = class extends S3Base {
   }
   initAsPrivateBucket(includeConstraintLocation) {
     return __async(this, null, function* () {
-      var _a2, _b;
+      var _a, _b;
       const bucketName = this.bucket;
       const isExists = yield this.isBucketExists();
       if (isExists) {
-        (_a2 = this.logger) == null ? void 0 : _a2.info(this.reqId, `Bucket already exists.`, { bucketName });
+        (_a = this.logger) == null ? void 0 : _a.info(this.reqId, `Bucket already exists.`, { bucketName });
         return;
       }
       const createParams = __spreadValues({
@@ -619,14 +632,14 @@ var S3Bucket = class extends S3Base {
       includeConstraintLocation = false,
       skipInitializedBucket = false
     } = {}) {
-      var _a2;
+      var _a;
       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 });
+        (_a = this.logger) == null ? void 0 : _a.info(this.reqId, `Bucket already exists.`, { bucketName });
         return;
       }
       const data = acl === "private" /* private */ ? yield this.initAsPrivateBucket(includeConstraintLocation) : yield this.initAsPublicBucket();
@@ -660,7 +673,7 @@ var S3Bucket = class extends S3Base {
   }
   bucketInfo(options) {
     return __async(this, null, function* () {
-      var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
       const bucketName = this.bucket;
       const info = {
         name: bucketName,
@@ -673,7 +686,7 @@ var S3Bucket = class extends S3Base {
           const headBucketResponse = yield this.execute(
             new import_client_s32.HeadBucketCommand(__spreadValues({ Bucket: bucketName }, options))
           );
-          (_a2 = this.logger) == null ? void 0 : _a2.debug("bucketInfo", "HeadBucketCommandOutput", headBucketResponse);
+          (_a = this.logger) == null ? void 0 : _a.debug("bucketInfo", "HeadBucketCommandOutput", headBucketResponse);
           info.exists = true;
           info.bucketRegion = headBucketResponse.BucketRegion;
           info.accessPointAlias = headBucketResponse.AccessPointAlias;
@@ -699,9 +712,9 @@ var S3Bucket = class extends S3Base {
           );
           (_e = this.logger) == null ? void 0 : _e.debug("bucketInfo", "GetBucketAclCommandOutput", aclResponse);
           info.acl = (_f = aclResponse.Grants) == null ? void 0 : _f.map((grant) => {
-            var _a3;
+            var _a2;
             return {
-              grantee: (_a3 = grant.Grantee) == null ? void 0 : _a3.Type,
+              grantee: (_a2 = grant.Grantee) == null ? void 0 : _a2.Type,
               permission: grant.Permission
             };
           });
@@ -768,11 +781,11 @@ var S3Bucket = class extends S3Base {
   }
   destroyBucket(forceDeleteAllFilesBeforeDestroyBucket = false) {
     return __async(this, null, function* () {
-      var _a2;
+      var _a;
       const bucketName = this.bucket;
       const isExists = yield this.isBucketExists();
       if (!isExists) {
-        (_a2 = this.logger) == null ? void 0 : _a2.debug(this.reqId, `Bucket not exists.`, { bucketName });
+        (_a = this.logger) == null ? void 0 : _a.debug(this.reqId, `Bucket not exists.`, { bucketName });
         return;
       }
       if (forceDeleteAllFilesBeforeDestroyBucket) {
@@ -792,7 +805,7 @@ var S3Directory = class extends S3Bucket {
   }
   directoryExists(directoryPath) {
     return __async(this, null, function* () {
-      var _a2;
+      var _a;
       try {
         const normalizedKey = getNormalizedPath(directoryPath);
         if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
@@ -800,7 +813,7 @@ var S3Directory = class extends S3Bucket {
         yield this.execute(command);
         return true;
       } catch (error) {
-        if (error.name === "NotFound" || ((_a2 = error.$metadata) == null ? void 0 : _a2.httpStatusCode) === 404) {
+        if (error.name === "NotFound" || ((_a = error.$metadata) == null ? void 0 : _a.httpStatusCode) === 404) {
           return false;
         }
         throw error;
@@ -818,7 +831,7 @@ var S3Directory = class extends S3Bucket {
   }
   deleteDirectory(directoryPath) {
     return __async(this, null, function* () {
-      var _a2, _b, _c, _d, _e, _f, _g;
+      var _a, _b, _c, _d, _e, _f, _g;
       let normalizedPath = getNormalizedPath(directoryPath);
       if (!normalizedPath) throw new Error("No directory path provided");
       if (normalizedPath === "/") normalizedPath = "";
@@ -842,7 +855,7 @@ var S3Directory = class extends S3Bucket {
               }
             })
           );
-          totalDeletedCount += (_b = (_a2 = deleteResult.Deleted) == null ? void 0 : _a2.length) != null ? _b : 0;
+          totalDeletedCount += (_b = (_a = deleteResult.Deleted) == null ? void 0 : _a.length) != null ? _b : 0;
           if (deleteResult.Errors && deleteResult.Errors.length > 0) {
             (_c = this.logger) == null ? void 0 : _c.warn(this.reqId, `Some objects failed to delete`, {
               directoryPath: normalizedPath,
@@ -887,7 +900,7 @@ var S3Directory = class extends S3Bucket {
   }
   directoryList(directoryPath) {
     return __async(this, null, function* () {
-      var _a2;
+      var _a;
       let normalizedPath = getNormalizedPath(directoryPath);
       if (normalizedPath !== "/" && directoryPath !== "" && directoryPath !== void 0) normalizedPath += "/";
       else normalizedPath = this.localstack ? "" : "/";
@@ -920,7 +933,7 @@ var S3Directory = class extends S3Bucket {
           })
         );
       }
-      (_a2 = this.logger) == null ? void 0 : _a2.debug(null, "#### directoryList", {
+      (_a = this.logger) == null ? void 0 : _a.debug(null, "#### directoryList", {
         normalizedPath,
         CommonPrefixes: result.CommonPrefixes,
         ContentFile: result.Contents
@@ -931,8 +944,8 @@ var S3Directory = class extends S3Bucket {
         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("/"));
+        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(/^\//, "")}`,
@@ -971,8 +984,8 @@ var S3Directory = class extends S3Bucket {
             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("/"));
+            var _a;
+            return content.Key !== normalizedPath && !((_a = content.Key) == null ? void 0 : _a.endsWith("/"));
           }).map((content) => __spreadProps(__spreadValues({}, content), {
             Name: content.Key.replace(normalizedPath, "") || content.Key,
             Location: `${this.link}${content.Key.replace(/^\//, "")}`,
@@ -1075,7 +1088,7 @@ var S3File = class extends S3Directory {
   }
   fileList(directoryPath, fileNamePrefix) {
     return __async(this, null, function* () {
-      var _a2, _b;
+      var _a, _b;
       let normalizedPath = getNormalizedPath(directoryPath);
       if (normalizedPath !== "/" && directoryPath !== "" && directoryPath !== void 0) normalizedPath += "/";
       else normalizedPath = this.localstack ? "" : "/";
@@ -1086,11 +1099,11 @@ var S3File = class extends S3Directory {
         Delimiter: "/"
       });
       const result = yield this.execute(command);
-      const files = ((_a2 = result.Contents) != null ? _a2 : []).filter((v) => v).map(
+      const files = ((_a = result.Contents) != null ? _a : []).filter((v) => v).map(
         (content) => {
-          var _a3, _b2, _c;
+          var _a2, _b2, _c;
           return __spreadProps(__spreadValues({}, content), {
-            Name: (_b2 = (_a3 = content.Key) == null ? void 0 : _a3.replace(prefix, "")) != null ? _b2 : content.Key,
+            Name: (_b2 = (_a2 = content.Key) == null ? void 0 : _a2.replace(prefix, "")) != null ? _b2 : content.Key,
             Location: content.Key ? `${this.link}${(_c = content.Key) == null ? void 0 : _c.replace(/^\//, "")}` : "",
             LastModified: content.LastModified ? new Date(content.LastModified) : null
           });
@@ -1107,7 +1120,7 @@ var S3File = class extends S3Directory {
       // 0-based: page 0 = items 0-99, page 1 = items 100-199, page 2 = items 200-299
       pageSize = 100
     } = {}) {
-      var _a2, _b;
+      var _a, _b;
       let normalizedPath = getNormalizedPath(directoryPath);
       if (normalizedPath !== "/" && directoryPath !== "" && directoryPath !== void 0) normalizedPath += "/";
       else normalizedPath = "";
@@ -1126,11 +1139,11 @@ var S3File = class extends S3Directory {
           })
         );
         if (currentPage === pageNumber) {
-          resultFiles = ((_a2 = result.Contents) != null ? _a2 : []).filter((v) => v).map(
+          resultFiles = ((_a = result.Contents) != null ? _a : []).filter((v) => v).map(
             (content) => {
-              var _a3, _b2;
+              var _a2, _b2;
               return __spreadProps(__spreadValues({}, content), {
-                Name: (_b2 = (_a3 = content.Key) == null ? void 0 : _a3.replace(prefix, "")) != null ? _b2 : content.Key,
+                Name: (_b2 = (_a2 = content.Key) == null ? void 0 : _a2.replace(prefix, "")) != null ? _b2 : content.Key,
                 Location: content.Key ? `${this.link}${content.Key.replace(/^\//, "")}` : "",
                 LastModified: content.LastModified ? new Date(content.LastModified) : null
               });
@@ -1157,7 +1170,7 @@ var S3File = class extends S3Directory {
   }
   taggingFile(fileKey, tag) {
     return __async(this, null, function* () {
-      var _a2;
+      var _a;
       let normalizedKey = "";
       const tags = [].concat(tag);
       try {
@@ -1171,25 +1184,25 @@ var S3File = class extends S3Directory {
         yield this.execute(command);
         return true;
       } catch (error) {
-        (_a2 = this.logger) == null ? void 0 : _a2.warn(null, "failed to tagging file", { errMsg: error.message, fileKey: normalizedKey, tags });
+        (_a = this.logger) == null ? void 0 : _a.warn(null, "failed to tagging file", { errMsg: error.message, fileKey: normalizedKey, tags });
         return false;
       }
     });
   }
   fileVersion(fileKey) {
     return __async(this, null, function* () {
-      var _a2, _b;
+      var _a, _b;
       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);
-      const tag = (_a2 = result.TagSet) == null ? void 0 : _a2.find((tag2) => tag2.Key === "version");
+      const tag = (_a = result.TagSet) == null ? void 0 : _a.find((tag2) => tag2.Key === "version");
       return (_b = tag == null ? void 0 : tag.Value) != null ? _b : "";
     });
   }
   fileUrl(fileKey, expiresIn = "15m") {
     return __async(this, null, function* () {
-      var _a2;
+      var _a;
       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;
@@ -1198,19 +1211,19 @@ 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, fileKey: normalizedKey, expiresIn });
+      (_a = this.logger) == null ? void 0 : _a.info(null, "generate signed file url", { url, fileKey: normalizedKey, expiresIn });
       return url;
     });
   }
   sizeOf(fileKey, unit = "b") {
     return __async(this, null, function* () {
-      var _a2, _b, _c;
+      var _a, _b, _c;
       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;
+        const bytes2 = (_a = headObject.ContentLength) != null ? _a : 0;
         return getUnitBytes(bytes2, unit);
       } catch (error) {
         if (error.name === "NotFound" || ((_b = error.$metadata) == null ? void 0 : _b.httpStatusCode) === 404) {
@@ -1223,7 +1236,7 @@ var S3File = class extends S3Directory {
   }
   fileExists(fileKey) {
     return __async(this, null, function* () {
-      var _a2;
+      var _a;
       try {
         const normalizedKey = getNormalizedPath(fileKey);
         if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
@@ -1231,7 +1244,7 @@ var S3File = class extends S3Directory {
         yield this.execute(command);
         return true;
       } catch (error) {
-        if (error.name === "NotFound" || ((_a2 = error.$metadata) == null ? void 0 : _a2.httpStatusCode) === 404) {
+        if (error.name === "NotFound" || ((_a = error.$metadata) == null ? void 0 : _a.httpStatusCode) === 404) {
           return false;
         }
         throw error;
@@ -1323,8 +1336,8 @@ var S3File = class extends S3Directory {
 // src/aws/s3/s3-stream.ts
 var pump = (0, import_util.promisify)(import_stream.pipeline);
 var S3Stream = class _S3Stream extends S3File {
-  constructor(_a2) {
-    var _b = _a2, { maxUploadFileSizeRestriction = "10GB", concurrencyVideoLimit = 0 } = _b, props = __objRest(_b, ["maxUploadFileSizeRestriction", "concurrencyVideoLimit"]);
+  constructor(_a) {
+    var _b = _a, { maxUploadFileSizeRestriction = "10GB", concurrencyVideoLimit = 0 } = _b, props = __objRest(_b, ["maxUploadFileSizeRestriction", "concurrencyVideoLimit"]);
     super(props);
     __publicField(this, "maxUploadFileSizeRestriction");
     __publicField(this, "s3Limiter");
@@ -1336,8 +1349,8 @@ var S3Stream = class _S3Stream extends S3File {
       cachingAge: _cachingAge = "1y"
     } = {}) => {
       return (req, res, next) => __async(this, null, function* () {
-        var _a2, _b, _c, _d, _e, _f, _g, _h;
-        let fileKey = _fileKey || (((_a2 = req.params) == null ? void 0 : _a2[paramsField]) ? decodeURIComponent((_b = req.params) == null ? void 0 : _b[paramsField]) : void 0) || (((_c = req.query) == null ? void 0 : _c[queryField]) ? decodeURIComponent((_d = req.query) == null ? void 0 : _d[queryField]) : void 0) || (((_e = req.headers) == null ? void 0 : _e[headerField]) ? decodeURIComponent((_f = req.headers) == null ? void 0 : _f[headerField]) : void 0);
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        let fileKey = _fileKey || (((_a = req.params) == null ? void 0 : _a[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 === "/") {
           (_g = this.logger) == null ? void 0 : _g.warn(req.id, "image fileKey is required");
           next(Error("image fileKey is required"));
@@ -1380,8 +1393,8 @@ var S3Stream = class _S3Stream extends S3File {
       cachingAge: _cachingAge = "1h"
     } = {}) => {
       return (req, res, next) => __async(this, null, function* () {
-        var _a2, _b, _c, _d, _e, _f, _g, _h;
-        let fileKey = _fileKey || (((_a2 = req.params) == null ? void 0 : _a2[paramsField]) ? decodeURIComponent((_b = req.params) == null ? void 0 : _b[paramsField]) : void 0) || (((_c = req.query) == null ? void 0 : _c[queryField]) ? decodeURIComponent((_d = req.query) == null ? void 0 : _d[queryField]) : void 0) || (((_e = req.headers) == null ? void 0 : _e[headerField]) ? decodeURIComponent((_f = req.headers) == null ? void 0 : _f[headerField]) : void 0);
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        let fileKey = _fileKey || (((_a = req.params) == null ? void 0 : _a[paramsField]) ? decodeURIComponent((_b = req.params) == null ? void 0 : _b[paramsField]) : void 0) || (((_c = req.query) == null ? void 0 : _c[queryField]) ? decodeURIComponent((_d = req.query) == null ? void 0 : _d[queryField]) : void 0) || (((_e = req.headers) == null ? void 0 : _e[headerField]) ? decodeURIComponent((_f = req.headers) == null ? void 0 : _f[headerField]) : void 0);
         if (!fileKey) {
           (_g = this.logger) == null ? void 0 : _g.warn(req.id, "iframe fileKey is required");
           next(Error("iframe fileKey is required"));
@@ -1421,7 +1434,7 @@ var S3Stream = class _S3Stream extends S3File {
     this.maxUploadFileSizeRestriction = maxUploadFileSizeRestriction;
     this.s3Limiter = concurrencyVideoLimit ? (0, import_p_limit.default)(concurrencyVideoLimit) : null;
   }
-  streamObjectFile(_0) {
+  getObjectFileStream(_0) {
     return __async(this, arguments, function* (fileKey, {
       Range,
       checkFileExists = true,
@@ -1449,7 +1462,7 @@ var S3Stream = class _S3Stream extends S3File {
       Range,
       abortSignal
     } = {}) {
-      var _a2;
+      var _a;
       let normalizedKey = getNormalizedPath(fileKey);
       if (!normalizedKey || normalizedKey === "/") throw new Error("No file key provided");
       try {
@@ -1472,7 +1485,7 @@ var S3Stream = class _S3Stream extends S3File {
           }
         };
       } catch (error) {
-        (_a2 = this.logger) == null ? void 0 : _a2.warn(this.reqId, "streamVideoFile error", {
+        (_a = this.logger) == null ? void 0 : _a.warn(this.reqId, "streamVideoFile error", {
           Bucket: this.bucket,
           fileKey: normalizedKey,
           Range,
@@ -1494,8 +1507,8 @@ var S3Stream = class _S3Stream extends S3File {
       streamTimeoutMS = 3e4
     } = {}) {
       return (req, res, next) => __async(this, null, function* () {
-        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);
+        var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+        let fileKey = _fileKey || (((_a = req.params) == null ? void 0 : _a[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");
@@ -1572,9 +1585,9 @@ var S3Stream = class _S3Stream extends S3File {
             res.end();
           }, streamTimeoutMS);
           res.once("close", () => {
-            var _a3;
+            var _a2;
             clearTimeout(timeout);
-            (_a3 = body.destroy) == null ? void 0 : _a3.call(body);
+            (_a2 = body.destroy) == null ? void 0 : _a2.call(body);
             req.off("close", onClose);
           });
           yield pump(body, res);
@@ -1617,8 +1630,8 @@ var S3Stream = class _S3Stream extends S3File {
       cachingAge: _cachingAge = "1h"
     } = {}) {
       return (req, res, next) => __async(this, null, function* () {
-        var _a2, _b, _c, _d, _e, _f, _g, _h, _i;
-        const fileKey = _fileKey || (((_a2 = req.params) == null ? void 0 : _a2[paramsField]) ? (_b = req.params) == null ? void 0 : _b[paramsField] : void 0) || (((_c = req.query) == null ? void 0 : _c[queryField]) ? (_d = req.query) == null ? void 0 : _d[queryField] : void 0) || (((_e = req.headers) == null ? void 0 : _e[headerField]) ? decodeURIComponent((_f = req.headers) == null ? void 0 : _f[headerField]) : void 0);
+        var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+        const fileKey = _fileKey || (((_a = req.params) == null ? void 0 : _a[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"));
@@ -1627,9 +1640,9 @@ var S3Stream = class _S3Stream extends S3File {
         const abort = new AbortController();
         let stream = null;
         const onClose = () => {
-          var _a3;
+          var _a2;
           abort.abort();
-          (_a3 = stream == null ? void 0 : stream.destroy) == null ? void 0 : _a3.call(stream);
+          (_a2 = stream == null ? void 0 : stream.destroy) == null ? void 0 : _a2.call(stream);
         };
         req.once("close", onClose);
         let normalizedKey = getNormalizedPath(fileKey);
@@ -1641,7 +1654,7 @@ var S3Stream = class _S3Stream extends S3File {
             next(Error(`File not found: "${normalizedKey}"`));
             return;
           }
-          stream = yield this.streamObjectFile(normalizedKey, {
+          stream = yield this.getObjectFileStream(normalizedKey, {
             abortSignal: abort.signal,
             checkFileExists: false
           });
@@ -1651,9 +1664,9 @@ var S3Stream = class _S3Stream extends S3File {
             return;
           }
           const fileInfo = yield this.fileInfo(normalizedKey);
-          const fileName = filename || normalizedKey.split("/").pop() || "download";
           const contentType = fileInfo.ContentType || "application/octet-stream";
           const ext = (0, import_pathe2.extname)(fileKey).slice(1).toLowerCase();
+          const fileName = filename || normalizedKey.split("/").pop() || `${Date.now()}.${ext}`;
           const inlineTypes = ["text/", "image/", "application/pdf", "video/", "audio/"];
           const canDisplayInline = SUPPORTED_IFRAME_EXTENSIONS.includes(ext) || inlineTypes.some((type) => contentType.startsWith(type));
           res.setHeader("Content-Type", contentType);
@@ -1669,15 +1682,16 @@ var S3Stream = class _S3Stream extends S3File {
           if (cachingAge) {
             res.setHeader("Cache-Control", `public, max-age=${cachingAge}`);
           }
+          res.setHeader("Access-Control-Expose-Headers", "Content-Type, Content-Disposition, Content-Length");
           stream.on("error", (err) => {
-            var _a3, _b2;
-            (_a3 = this.logger) == null ? void 0 : _a3.warn(this.reqId, "Stream error", { fileKey: normalizedKey, error: err });
+            var _a2, _b2;
+            (_a2 = this.logger) == null ? void 0 : _a2.warn(this.reqId, "Stream error", { fileKey: normalizedKey, error: err });
             abort.abort();
             (_b2 = stream == null ? void 0 : stream.destroy) == null ? void 0 : _b2.call(stream);
           });
           res.once("close", () => {
-            var _a3;
-            (_a3 = stream == null ? void 0 : stream.destroy) == null ? void 0 : _a3.call(stream);
+            var _a2;
+            (_a2 = stream == null ? void 0 : stream.destroy) == null ? void 0 : _a2.call(stream);
             req.off("close", onClose);
           });
           streamMethod || (streamMethod = canDisplayInline ? "pipe" : "pipeline");
@@ -1721,11 +1735,11 @@ var S3Stream = class _S3Stream extends S3File {
       compressionLevel = 5
     } = {}) {
       return (req, res, next) => __async(this, null, function* () {
-        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+        var _a, _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);
+          let fileKey = _fileKey || (((_a = req.params) == null ? void 0 : _a[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"));
@@ -1740,12 +1754,12 @@ var S3Stream = class _S3Stream extends S3File {
           req.once("close", onClose);
           (_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;
+            var _a2, _b2, _c2;
             try {
               if (abort.signal.aborted) return null;
-              const stream = yield this.streamObjectFile(fileKey2, { abortSignal: abort.signal });
+              const stream = yield this.getObjectFileStream(fileKey2, { abortSignal: abort.signal });
               if (!stream) {
-                (_a3 = this.logger) == null ? void 0 : _a3.warn(this.reqId, "File not found", { fileKey: fileKey2 });
+                (_a2 = this.logger) == null ? void 0 : _a2.warn(this.reqId, "File not found", { fileKey: fileKey2 });
                 return null;
               }
               const chunks = [];
@@ -1816,8 +1830,8 @@ var S3Stream = class _S3Stream extends S3File {
           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 });
+            var _a2;
+            (_a2 = this.logger) == null ? void 0 : _a2.error(this.reqId, "Archive error", { error: err });
             abort.abort();
             if (!res.headersSent) {
               next(err);
@@ -1933,18 +1947,18 @@ var S3Stream = class _S3Stream extends S3File {
    * Adds the uploaded file info to req.s3File
    */
   uploadSingleFileMW(fieldName, directoryPath, options = {}) {
-    var _a2;
+    var _a;
     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 });
+    (_a = this.logger) == null ? void 0 : _a.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 _a3, _b;
+        var _a2, _b;
         if (err) {
-          (_a3 = this.logger) == null ? void 0 : _a3.error(this.reqId, "Single file upload error", { fieldName, error: err.message });
+          (_a2 = this.logger) == null ? void 0 : _a2.error(this.reqId, "Single file upload error", { fieldName, error: err.message });
           return next(err);
         }
         if (req.file) {
@@ -1973,9 +1987,9 @@ var S3Stream = class _S3Stream extends S3File {
     return (req, res, next) => {
       const mw = upload.array(fieldName, maxFilesCount || void 0);
       mw(req, res, (err) => {
-        var _a2, _b;
+        var _a, _b;
         if (err) {
-          (_a2 = this.logger) == null ? void 0 : _a2.error(this.reqId, "Multiple files upload error", { fieldName, error: err.message });
+          (_a = this.logger) == null ? void 0 : _a.error(this.reqId, "Multiple files upload error", { fieldName, error: err.message });
           return next(err);
         }
         if (Array.isArray(req.files)) {
@@ -2002,9 +2016,9 @@ var S3Stream = class _S3Stream extends S3File {
     return (req, res, next) => {
       const anyUpload = maxCount ? upload.any() : upload.any();
       anyUpload(req, res, (err) => {
-        var _a2, _b;
+        var _a, _b;
         if (err) {
-          (_a2 = this.logger) == null ? void 0 : _a2.error(this.reqId, "Any files upload error", { error: err.message });
+          (_a = this.logger) == null ? void 0 : _a.error(this.reqId, "Any files upload error", { error: err.message });
           return next(err);
         }
         if (req.files && Array.isArray(req.files)) {
@@ -2083,10 +2097,14 @@ var S3Stream = class _S3Stream extends S3File {
 };
 
 // src/aws/s3/s3-util.ts
+var import_client_s36 = require("@aws-sdk/client-s3");
 var S3Util = class extends S3Stream {
   constructor(props) {
     super(props);
   }
+  get client() {
+    return this.s3Client;
+  }
 };
 
 // src/aws/s3/s3-util.localstack.ts
@@ -2094,21 +2112,24 @@ var S3LocalstackUtil = class extends S3Util {
   constructor(props) {
     super(__spreadProps(__spreadValues({}, props), { localstack: true }));
   }
+  get client() {
+    return this.s3Client;
+  }
   directoryList(directoryPath) {
     return __async(this, null, function* () {
-      var _a2;
+      var _a;
       let normalizedPath = getNormalizedPath(directoryPath);
       if (normalizedPath !== "/" && directoryPath !== "" && directoryPath !== void 0) normalizedPath += "/";
       else normalizedPath = "";
       let result;
       result = yield this.execute(
-        new import_client_s36.ListObjectsV2Command({
+        new import_client_s37.ListObjectsV2Command({
           Bucket: this.bucket,
           Prefix: normalizedPath,
           Delimiter: "/"
         })
       );
-      (_a2 = this.logger) == null ? void 0 : _a2.debug(null, "#### directoryList", {
+      (_a = this.logger) == null ? void 0 : _a.debug(null, "#### directoryList", {
         normalizedPath,
         CommonPrefixes: result.CommonPrefixes,
         ContentFile: result.Contents
@@ -2119,8 +2140,8 @@ var S3LocalstackUtil = class extends S3Util {
         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("/"));
+        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(/^\//, "")}`,
@@ -2145,7 +2166,7 @@ var S3LocalstackUtil = class extends S3Util {
       while (currentPage <= pageNumber) {
         let result;
         result = yield this.execute(
-          new import_client_s36.ListObjectsV2Command({
+          new import_client_s37.ListObjectsV2Command({
             Bucket: this.bucket,
             Prefix: normalizedPath,
             Delimiter: "/",
@@ -2159,8 +2180,8 @@ var S3LocalstackUtil = class extends S3Util {
             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("/"));
+            var _a;
+            return content.Key !== normalizedPath && !((_a = content.Key) == null ? void 0 : _a.endsWith("/"));
           }).map((content) => __spreadProps(__spreadValues({}, content), {
             Name: content.Key.replace(normalizedPath, "") || content.Key,
             Location: `${this.link}${content.Key.replace(/^\//, "")}`,
@@ -2182,44 +2203,67 @@ var S3LocalstackUtil = class extends S3Util {
   }
 };
 
-// src/aws/sns.ts
+// src/aws/sns/sns-base.ts
 var import_client_sns = require("@aws-sdk/client-sns");
-var SNSUtil = class {
+var SnsBase = class {
   constructor({
+    logger,
+    reqId,
     accessKeyId = AWSConfigSharingUtil.accessKeyId,
     secretAccessKey = AWSConfigSharingUtil.secretAccessKey,
     endpoint = AWSConfigSharingUtil.endpoint,
-    region = AWSConfigSharingUtil.region,
-    topicArn,
-    debug = false
+    region = AWSConfigSharingUtil.region
   }) {
     __publicField(this, "sns");
-    __publicField(this, "topicArn");
+    __publicField(this, "endpoint");
+    __publicField(this, "region");
+    __publicField(this, "logger");
+    __publicField(this, "reqId");
     const credentials = { accessKeyId, secretAccessKey };
     const options = __spreadValues(__spreadValues(__spreadValues({}, accessKeyId && secretAccessKey && { credentials }), endpoint && { endpoint }), region && { region });
-    if (debug) {
-      console.log("LambdaUtil client options", options);
-    }
+    this.endpoint = endpoint;
+    this.region = region;
+    this.logger = logger;
+    this.reqId = reqId != null ? reqId : null;
+    this.sns = new import_client_sns.SNS(__spreadValues({}, options));
+  }
+};
+
+// src/aws/sns/sns-topic.ts
+var SnsTopic = class extends SnsBase {
+  constructor(_a) {
+    var _b = _a, { topicArn } = _b, props = __objRest(_b, ["topicArn"]);
+    super(props);
+    __publicField(this, "topicArn");
     this.topicArn = topicArn;
-    this.sns = new import_client_sns.SNS(__spreadValues(__spreadValues(__spreadValues({}, credentials && { credentials }), endpoint && { endpoint }), region && { region }));
   }
-  publishTopicMessage(message) {
+  publishMessage(message) {
     return __async(this, null, function* () {
-      this.sns.publish({
+      return this.sns.publish({
         Message: typeof message === "string" ? message : JSON.stringify(message),
         TopicArn: this.topicArn
       });
     });
   }
 };
+
+// src/aws/sns/sns-util.ts
+var SnsUtil = class extends SnsTopic {
+  constructor(props) {
+    super(props);
+  }
+  get client() {
+    return this.sns;
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ACLs,
   AWSConfigSharingUtil,
-  IAMUtil,
+  IamUtil,
   LambdaUtil,
   S3LocalstackUtil,
   S3Util,
-  SNSUtil,
-  SUPPORTED_IFRAME_EXTENSIONS
+  SUPPORTED_IFRAME_EXTENSIONS,
+  SnsUtil
 });