fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 05:29:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: unable to delete files stored in S3 (#6467)

Browse Source
This commit is contained in:
chenos 2025-03-14 20:18:14 +08:00 committed by GitHub
parent cc524c45fe
commit 7331cc78f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
packages/plugins/@nocobase/plugin-file-manager/src/server/storages/s3.ts
View File

@ -7,6 +7,8 @@
* For more information, please refer to: https://www.nocobase.com/agreement.
*/
import { DeleteObjectsCommand } from '@aws-sdk/client-s3';
import crypto from 'crypto';
import { AttachmentModel, StorageType } from '.';
import { STORAGE_TYPE_S3 } from '../../constants';
import { cloudFilenameGetter, getFileKey } from '../utils';
@ -62,18 +64,39 @@ export default class extends StorageType {
});
}
async delete(records: AttachmentModel[]): Promise<[number, AttachmentModel[]]> {
const { DeleteObjectsCommand } = require('@aws-sdk/client-s3');
const { s3 } = this.make();
const { Deleted } = await s3.send(
new DeleteObjectsCommand({
Bucket: this.storage.options.bucket,
Delete: {
Objects: records.map((record) => ({ Key: getFileKey(record) })),
},
}),
);
calculateContentMD5(body) {
const hash = crypto.createHash('md5').update(body).digest('base64');
return hash;
}
async deleteS3Objects(bucketName: string, objects: string[]) {
const deleteBody = JSON.stringify({
Objects: objects.map((objectKey) => ({ Key: objectKey })),
});
const contentMD5 = this.calculateContentMD5(deleteBody);
const deleteCommand = new DeleteObjectsCommand({
Bucket: bucketName,
Delete: JSON.parse(deleteBody),
});
deleteCommand.middlewareStack.add(
(next, context) => async (args) => {
args.request['headers']['Content-Md5'] = contentMD5;
return next(args);
},
{ step: 'build' },
);
const { s3 } = this.make();
return await s3.send(deleteCommand);
}
async delete(records: AttachmentModel[]): Promise<[number, AttachmentModel[]]> {
const { Deleted } = await this.deleteS3Objects(
this.storage.options.bucket,
records.map((record) => getFileKey(record)),
);
return [Deleted.length, records.filter((record) => !Deleted.find((item) => item.Key === getFileKey(record)))];
}
}