Merge stable branch

This commit is contained in:
Antoine du Hamel 2024-06-18 11:50:14 +02:00
commit a42b150639
No known key found for this signature in database
GPG key ID: 21D900FFDB233756
52 changed files with 3526 additions and 244 deletions

View file

@ -227,32 +227,29 @@ app.get('/s3/multipart/:uploadId', (req, res, next) => {
const parts = []
function listPartsPage(startAt) {
client.send(
new ListPartsCommand({
Bucket: process.env.COMPANION_AWS_BUCKET,
Key: key,
UploadId: uploadId,
PartNumberMarker: startAt,
}),
(err, data) => {
if (err) {
next(err)
return
}
function listPartsPage(startsAt = undefined) {
client.send(new ListPartsCommand({
Bucket: process.env.COMPANION_AWS_BUCKET,
Key: key,
UploadId: uploadId,
PartNumberMarker: startsAt,
}), (err, data) => {
if (err) {
next(err)
return
}
parts.push(...data.Parts)
if (data.IsTruncated) {
// Get the next page.
listPartsPage(data.NextPartNumberMarker)
} else {
res.json(parts)
}
},
)
// continue to get list of all uploaded parts until the IsTruncated flag is false
if (data.IsTruncated) {
listPartsPage(data.NextPartNumberMarker)
} else {
res.json(parts)
}
})
}
listPartsPage(0)
listPartsPage()
})
function isValidPart(part) {