@hdriel/aws-utils 1.2.0 → 1.2.1

package/dist/index.cjs

@@ -279,6 +279,7 @@ var import_archiver = __toESM(require("archiver"), 1);
 var import_node_stream2 = require("stream");
 var import_multer_s3 = __toESM(require("multer-s3"), 1);
 var import_multer = __toESM(require("multer"), 1);
+var import_p_limit = __toESM(require("p-limit"), 1);
 var import_client_s35 = require("@aws-sdk/client-s3");
 
 // src/utils/consts.ts
@@ -289,10 +290,6 @@ var ACLs = /* @__PURE__ */ ((ACLs2) => {
   return ACLs2;
 })(ACLs || {});
 
-// src/utils/concurrency.ts
-var import_p_limit = __toESM(require("p-limit"), 1);
-var s3Limiter = (0, import_p_limit.default)(4);
-
 // src/utils/helpers.ts
 var import_bytes = __toESM(require("bytes"), 1);
 var import_ms = __toESM(require("ms"), 1);
@@ -1110,7 +1107,7 @@ var S3File = class extends S3Directory {
       return url;
     });
   }
-  sizeOf(fileKey, unit) {
+  sizeOf(fileKey, unit = "b") {
     return __async(this, null, function* () {
       var _a2, _b, _c;
       const normalizedKey = getNormalizedPath(fileKey);
@@ -1232,9 +1229,10 @@ var S3File = class extends S3Directory {
 var pump = (0, import_util.promisify)(import_stream.pipeline);
 var S3Stream = class _S3Stream extends S3File {
   constructor(_a2) {
-    var _b = _a2, { maxUploadFileSizeRestriction = "10GB" } = _b, props = __objRest(_b, ["maxUploadFileSizeRestriction"]);
+    var _b = _a2, { maxUploadFileSizeRestriction = "10GB", concurrencyVideoLimit = 0 } = _b, props = __objRest(_b, ["maxUploadFileSizeRestriction", "concurrencyVideoLimit"]);
     super(props);
     __publicField(this, "maxUploadFileSizeRestriction");
+    __publicField(this, "s3Limiter");
     __publicField(this, "streamImageFileCtrl", ({
       fileKey: _fileKey,
       queryField = "file",
@@ -1321,6 +1319,7 @@ var S3Stream = class _S3Stream extends S3File {
       });
     });
     this.maxUploadFileSizeRestriction = maxUploadFileSizeRestriction;
+    this.s3Limiter = concurrencyVideoLimit ? (0, import_p_limit.default)(concurrencyVideoLimit) : null;
   }
   streamObjectFile(_0) {
     return __async(this, arguments, function* (fileKey, {
@@ -1358,7 +1357,7 @@ var S3Stream = class _S3Stream extends S3File {
           Bucket: this.bucket,
           Key: normalizedKey
         }, Range ? { Range } : {}));
-        const data = yield s3Limiter(() => this.execute(cmd, { abortSignal }));
+        const data = this.s3Limiter ? yield this.s3Limiter(() => this.execute(cmd, { abortSignal })) : yield this.execute(cmd, { abortSignal });
         const body = data.Body;
         if (!body) return null;
         return {
@@ -1785,6 +1784,7 @@ var S3Stream = class _S3Stream extends S3File {
         }),
         key: (req, file, cb) => __async(this, null, function* () {
           let filename;
+          file.originalname = decodeURIComponent(file.originalname);
           if (typeof _filename === "function") {
             filename = yield _filename(req, file);
           } else if (_filename) {

package/dist/index.d.cts

@@ -263,7 +263,7 @@ declare class S3File extends S3Directory {
     taggingFile(fileKey: string, tag: Tag | Tag[]): Promise<boolean>;
     fileVersion(fileKey: string): Promise<string>;
     fileUrl(fileKey: string, expiresIn?: number | StringValue): Promise<string>;
-    sizeOf(fileKey: string, unit: Unit): Promise<number>;
+    sizeOf(fileKey: string, unit?: Unit): Promise<number>;
     fileExists(fileKey: string): Promise<boolean>;
     fileContent(fileKey: string, format?: 'buffer' | 'base64' | 'utf8'): Promise<Buffer | string>;
     uploadFileContent(fileKey: string, fileData: Buffer | Readable | string | Uint8Array | object, { acl, version, prettier, }?: {
@@ -276,10 +276,12 @@ declare class S3File extends S3Directory {
 
 type S3StreamProps = S3FileProps & {
     maxUploadFileSizeRestriction?: ByteUnitStringValue;
+    concurrencyVideoLimit?: number | null;
 };
 declare class S3Stream extends S3File {
     private readonly maxUploadFileSizeRestriction;
-    constructor({ maxUploadFileSizeRestriction, ...props }: S3StreamProps);
+    private readonly s3Limiter;
+    constructor({ maxUploadFileSizeRestriction, concurrencyVideoLimit, ...props }: S3StreamProps);
     protected streamObjectFile(fileKey: string, { Range, checkFileExists, abortSignal, }?: {
         Range?: string;
         checkFileExists?: boolean;

package/dist/index.d.ts

@@ -263,7 +263,7 @@ declare class S3File extends S3Directory {
     taggingFile(fileKey: string, tag: Tag | Tag[]): Promise<boolean>;
     fileVersion(fileKey: string): Promise<string>;
     fileUrl(fileKey: string, expiresIn?: number | StringValue): Promise<string>;
-    sizeOf(fileKey: string, unit: Unit): Promise<number>;
+    sizeOf(fileKey: string, unit?: Unit): Promise<number>;
     fileExists(fileKey: string): Promise<boolean>;
     fileContent(fileKey: string, format?: 'buffer' | 'base64' | 'utf8'): Promise<Buffer | string>;
     uploadFileContent(fileKey: string, fileData: Buffer | Readable | string | Uint8Array | object, { acl, version, prettier, }?: {
@@ -276,10 +276,12 @@ declare class S3File extends S3Directory {
 
 type S3StreamProps = S3FileProps & {
     maxUploadFileSizeRestriction?: ByteUnitStringValue;
+    concurrencyVideoLimit?: number | null;
 };
 declare class S3Stream extends S3File {
     private readonly maxUploadFileSizeRestriction;
-    constructor({ maxUploadFileSizeRestriction, ...props }: S3StreamProps);
+    private readonly s3Limiter;
+    constructor({ maxUploadFileSizeRestriction, concurrencyVideoLimit, ...props }: S3StreamProps);
     protected streamObjectFile(fileKey: string, { Range, checkFileExists, abortSignal, }?: {
         Range?: string;
         checkFileExists?: boolean;

package/dist/index.js

@@ -240,6 +240,7 @@ import archiver from "archiver";
 import { Readable as Readable2 } from "stream";
 import multerS3 from "multer-s3";
 import multer from "multer";
+import pLimit from "p-limit";
 import { GetObjectCommand as GetObjectCommand2 } from "@aws-sdk/client-s3";
 
 // src/utils/consts.ts
@@ -250,10 +251,6 @@ var ACLs = /* @__PURE__ */ ((ACLs2) => {
   return ACLs2;
 })(ACLs || {});
 
-// src/utils/concurrency.ts
-import pLimit from "p-limit";
-var s3Limiter = pLimit(4);
-
 // src/utils/helpers.ts
 import bytes from "bytes";
 import ms from "ms";
@@ -1099,7 +1096,7 @@ var S3File = class extends S3Directory {
       return url;
     });
   }
-  sizeOf(fileKey, unit) {
+  sizeOf(fileKey, unit = "b") {
     return __async(this, null, function* () {
       var _a2, _b, _c;
       const normalizedKey = getNormalizedPath(fileKey);
@@ -1221,9 +1218,10 @@ var S3File = class extends S3Directory {
 var pump = promisify(pipeline);
 var S3Stream = class _S3Stream extends S3File {
   constructor(_a2) {
-    var _b = _a2, { maxUploadFileSizeRestriction = "10GB" } = _b, props = __objRest(_b, ["maxUploadFileSizeRestriction"]);
+    var _b = _a2, { maxUploadFileSizeRestriction = "10GB", concurrencyVideoLimit = 0 } = _b, props = __objRest(_b, ["maxUploadFileSizeRestriction", "concurrencyVideoLimit"]);
     super(props);
     __publicField(this, "maxUploadFileSizeRestriction");
+    __publicField(this, "s3Limiter");
     __publicField(this, "streamImageFileCtrl", ({
       fileKey: _fileKey,
       queryField = "file",
@@ -1310,6 +1308,7 @@ var S3Stream = class _S3Stream extends S3File {
       });
     });
     this.maxUploadFileSizeRestriction = maxUploadFileSizeRestriction;
+    this.s3Limiter = concurrencyVideoLimit ? pLimit(concurrencyVideoLimit) : null;
   }
   streamObjectFile(_0) {
     return __async(this, arguments, function* (fileKey, {
@@ -1347,7 +1346,7 @@ var S3Stream = class _S3Stream extends S3File {
           Bucket: this.bucket,
           Key: normalizedKey
         }, Range ? { Range } : {}));
-        const data = yield s3Limiter(() => this.execute(cmd, { abortSignal }));
+        const data = this.s3Limiter ? yield this.s3Limiter(() => this.execute(cmd, { abortSignal })) : yield this.execute(cmd, { abortSignal });
         const body = data.Body;
         if (!body) return null;
         return {
@@ -1774,6 +1773,7 @@ var S3Stream = class _S3Stream extends S3File {
         }),
         key: (req, file, cb) => __async(this, null, function* () {
           let filename;
+          file.originalname = decodeURIComponent(file.originalname);
           if (typeof _filename === "function") {
             filename = yield _filename(req, file);
           } else if (_filename) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hdriel/aws-utils",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Simplified AWS SDK (v3) utilities for S3 (upload, download, streaming) with TypeScript support",
   "author": "Hadriel Benjo (https://github.com/hdriel)",
   "type": "module",