streamby-core 0.9.14 → 0.9.16

package/dist/adapters/s3.js

@@ -18,8 +18,8 @@ function createS3Adapter(config) {
     return {
         async getPresignedUrl(filename, contentType, projectId) {
             const salt = await bcrypt_1.default.genSalt();
-            const hashedPassword = await bcrypt_1.default.hash(filename, salt);
-            const key = `${projectId}/${contentType}/file-${Date.now()}-${hashedPassword}`;
+            const hashed = await bcrypt_1.default.hash(filename, salt);
+            const key = `${projectId}/${contentType}/file-${Date.now()}-${hashed.replace(/\//g, '-')}`;
             const command = new client_s3_1.PutObjectCommand({
                 Bucket: config.bucket,
                 Key: key,
@@ -38,20 +38,30 @@ function createS3Adapter(config) {
             return result.Contents || [];
         },
         async deleteProjectDirectory(projectId) {
-            const listCommand = new client_s3_1.ListObjectsV2Command({
-                Bucket: config.bucket,
-                Prefix: `${projectId}/`,
-            });
-            const listedObjects = await s3.send(listCommand);
-            if (!listedObjects.Contents || listedObjects.Contents.length === 0)
-                return;
-            const deleteCommand = new client_s3_1.DeleteObjectsCommand({
-                Bucket: config.bucket,
-                Delete: {
-                    Objects: listedObjects.Contents.map((item) => ({ Key: item.Key })),
-                },
-            });
-            await s3.send(deleteCommand);
-        },
+            const prefix = `${projectId}/`;
+            let continuationToken = undefined;
+            while (true) {
+                const listCommand = new client_s3_1.ListObjectsV2Command({
+                    Bucket: config.bucket,
+                    Prefix: prefix,
+                    ContinuationToken: continuationToken
+                });
+                const listedObjects = await s3.send(listCommand);
+                const contents = listedObjects.Contents || [];
+                if (contents.length > 0) {
+                    const objectsToDelete = contents.map((item) => ({
+                        Key: item.Key
+                    }));
+                    const deleteCommand = new client_s3_1.DeleteObjectsCommand({
+                        Bucket: config.bucket,
+                        Delete: { Objects: objectsToDelete },
+                    });
+                    await s3.send(deleteCommand);
+                }
+                if (!listedObjects.IsTruncated)
+                    break;
+                continuationToken = listedObjects.NextContinuationToken;
+            }
+        }
     };
 }

package/dist/types/index.d.ts

@@ -10,7 +10,7 @@ export type StorageProviderType = 's3';
 export interface StorageAdapter {
     listFiles(projectId: string): Promise<any[]>;
     getPresignedUrl?: (filename: string, contentType: string, projectId: string) => Promise<any>;
-    deleteProjectDirectory: (projectId: string) => Promise<void>;
+    deleteProjectDirectory: (projectId: string) => Promise<any>;
 }
 export interface ProjectInfo {
     id: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "streamby-core",
-  "version": "0.9.14",
+  "version": "0.9.16",
   "description": "StreamBy middleware framework for media storage management",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",