Skip to content

fix: Sharp memory fragmentation #16978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 12 commits into from
Closed

fix: Sharp memory fragmentation #16978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
dcc0221
feat: add transformations
Marc-Roig Jun 8, 2023
0407c37
chore: refactor enhance image
Marc-Roig Jun 10, 2023
1c2104e
chore: get file type
Marc-Roig Jun 10, 2023
980754e
feat: throttle transformation
Marc-Roig Jun 11, 2023
d2dfe23
chore: upload service cleanup
Marc-Roig Jun 11, 2023
f5831d1
feat: thubmnail transformation
Marc-Roig Jun 11, 2023
204bbb1
feat: breakpoints transformation
Marc-Roig Jun 11, 2023
99d6a25
chore: update dependencies
Marc-Roig Jun 11, 2023
7ad9b94
feat: limit sharp concurrency
Marc-Roig Jun 12, 2023
5e143c9
close stream before uploading
Marc-Roig Jun 12, 2023
24daf10
add watermark to stream
Marc-Roig Jun 12, 2023
00c4c42
feat: re introduce transformations
Marc-Roig Jun 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/core/upload/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"byte-size": "7.0.1",
"cropperjs": "1.5.12",
"date-fns": "2.30.0",
"file-type": "^16.5.4",
"formik": "2.4.0",
"fs-extra": "10.0.0",
"immer": "9.0.19",
Expand All @@ -50,6 +51,7 @@
"react-redux": "8.0.5",
"react-select": "5.7.0",
"sharp": "0.32.0",
Copy link
Contributor

@markkaylor markkaylor Mar 21, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think we could bump sharp to 0.33.2? I'm thinking of this PR #19311 and the attached issue.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes! lets do that

"stream-throttle": "^0.1.3",
"yup": "^0.32.9"
},
"devDependencies": {
Expand Down
11 changes: 11 additions & 0 deletions packages/core/upload/server/services/metrics/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
'use strict';

const _ = require('lodash');

const getProviderName = () => strapi.config.get('plugin.upload.provider', 'local');
const isProviderPrivate = async () => strapi.plugin('upload').provider.isPrivate();

Expand All @@ -15,4 +17,13 @@ module.exports = ({ strapi }) => ({
},
});
},
sendMediaSaveMetrics(file) {
if (_.has(file, 'caption') && !_.isEmpty(file.caption)) {
strapi.telemetry.send('didSaveMediaWithCaption');
}

if (_.has(file, 'alternativeText') && !_.isEmpty(file.alternativeText)) {
strapi.telemetry.send('didSaveMediaWithAlternativeText');
}
},
});
2 changes: 2 additions & 0 deletions packages/core/upload/server/services/provider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ module.exports = ({ strapi }) => ({
if (isFunction(strapi.plugin('upload').provider.uploadStream)) {
file.stream = file.getStream();
await strapi.plugin('upload').provider.uploadStream(file);
file.stream.close();
file.stream.destroy();
delete file.stream;
} else {
file.buffer = await streamToBuffer(file.getStream());
Expand Down
Loading