@quatrain/storage-s3 1.2.6 → 1.2.8

package/dist/S3StorageAdapter.d.ts

@@ -118,5 +118,5 @@ export declare class S3StorageAdapter extends AbstractStorageAdapter {
      * @param bucket - Target bucket name.
      * @returns A promise resolving to bucket statistics.
      */
-    getBucketStats(bucket?: string): Promise<BucketStatsType>;
+    getBucketStats(bucket?: string, prefix?: string): Promise<BucketStatsType>;
 }

package/dist/S3StorageAdapter.js

@@ -72,7 +72,14 @@ class S3StorageAdapter extends storage_1.AbstractStorageAdapter {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
                 const _buf = [];
-                stream.on('data', (chunk) => _buf.push(chunk));
+                stream.on('data', (chunk) => {
+                    if (typeof chunk === 'string') {
+                        _buf.push(Buffer.from(chunk, 'utf-8'));
+                    }
+                    else {
+                        _buf.push(Buffer.from(chunk));
+                    }
+                });
                 stream.on('end', () => resolve(Buffer.concat(_buf)));
                 stream.on('error', (err) => reject(err));
             });
@@ -301,7 +308,7 @@ class S3StorageAdapter extends storage_1.AbstractStorageAdapter {
      * @param bucket - Target bucket name.
      * @returns A promise resolving to bucket statistics.
      */
-    getBucketStats(bucket) {
+    getBucketStats(bucket, prefix) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             const targetBucket = bucket || this._params.config.bucket;
@@ -310,11 +317,13 @@ class S3StorageAdapter extends storage_1.AbstractStorageAdapter {
             let isTruncated = true;
             let continuationToken = undefined;
             const folders = {};
-            storage_1.Storage.info(`Fetching bucket stats for ${targetBucket}`);
+            storage_1.Storage.info(`Fetching bucket stats for ${targetBucket} (prefix: ${prefix || 'none'})`);
+            const s3Prefix = prefix ? (prefix.endsWith('/') ? prefix : prefix + '/') : undefined;
             while (isTruncated) {
                 const input = {
                     Bucket: targetBucket,
                     ContinuationToken: continuationToken,
+                    Prefix: s3Prefix,
                 };
                 const command = new client_s3_1.ListObjectsV2Command(input);
                 const res = yield this._client.send(command);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quatrain/storage-s3",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "description": "Storage adapter for S3 compatible services",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.337.0",
     "@aws-sdk/s3-request-presigner": "^3.342.0",
-    "@quatrain/storage": "^1.2.7",
+    "@quatrain/storage": "^1.2.13",
     "fs-extra": "^11.2.0"
   },
   "scripts": {

package/src/S3StorageAdapter.ts

@@ -87,9 +87,15 @@ export class S3StorageAdapter extends AbstractStorageAdapter {
     */
    async streamToBuffer(stream: Stream): Promise<Buffer> {
       return new Promise<Buffer>((resolve, reject) => {
-         const _buf: any[] = []
+         const _buf: Buffer[] = []
 
-         stream.on('data', (chunk) => _buf.push(chunk))
+         stream.on('data', (chunk) => {
+            if (typeof chunk === 'string') {
+               _buf.push(Buffer.from(chunk, 'utf-8'))
+            } else {
+               _buf.push(Buffer.from(chunk))
+            }
+         })
          stream.on('end', () => resolve(Buffer.concat(_buf)))
          stream.on('error', (err) => reject(err))
       })
@@ -343,7 +349,7 @@ export class S3StorageAdapter extends AbstractStorageAdapter {
     * @param bucket - Target bucket name.
     * @returns A promise resolving to bucket statistics.
     */
-   async getBucketStats(bucket?: string): Promise<BucketStatsType> {
+   async getBucketStats(bucket?: string, prefix?: string): Promise<BucketStatsType> {
       const targetBucket = bucket || this._params.config.bucket
       let totalObjects = 0
       let totalSize = 0
@@ -351,12 +357,15 @@ export class S3StorageAdapter extends AbstractStorageAdapter {
       let continuationToken: string | undefined = undefined
       const folders: Record<string, any> = {}
 
-      Storage.info(`Fetching bucket stats for ${targetBucket}`)
+      Storage.info(`Fetching bucket stats for ${targetBucket} (prefix: ${prefix || 'none'})`)
+
+      const s3Prefix = prefix ? (prefix.endsWith('/') ? prefix : prefix + '/') : undefined
 
       while (isTruncated) {
          const input: ListObjectsV2CommandInput = {
             Bucket: targetBucket,
             ContinuationToken: continuationToken,
+            Prefix: s3Prefix,
          }
          const command = new ListObjectsV2Command(input)
          const res: ListObjectsV2CommandOutput = await this._client.send(command)