Fix screenshotHandler and re-introduce some unwillingly deleted improvements

This commit is contained in:
Gaël Métais
2023-11-07 19:59:13 +02:00
parent 73c5b3383e
commit a1f09ffedc
6 changed files with 41 additions and 147 deletions
+9 -80
View File
@@ -1,90 +1,19 @@
var debug = require('debug')('ylt:screenshotHandlerAgent');
var Jimp = require('jimp');
var debug = require('debug')('ylt:screenshotHandler');
var sharp = require('sharp');
var Q = require('q');
var fs = require('fs');
var path = require('path');
// Disable sharp cache to reduce the "disk is full" error on Amazon Lambda
sharp.cache(false);
var screenshotHandler = function() {
this.findAndOptimizeScreenshot = function(tmpScreenshotPath, width) {
var that = this;
debug('Starting screenshot transformation');
return this.openImage(tmpScreenshotPath)
.then(function(image) {
that.deleteTmpFile(tmpScreenshotPath);
return that.resizeImage(image, width);
})
.then(this.toBuffer);
};
this.openImage = function(imagePath) {
var deferred = Q.defer();
Jimp.read(imagePath, function(err, image){
if (err) {
debug('Could not open imagePath %s', imagePath);
debug(err);
deferred.reject(err);
} else {
debug('Image correctly open');
deferred.resolve(image);
}
});
return deferred.promise;
};
this.resizeImage = function(image, newWidth) {
var deferred = Q.defer();
var currentWidth = image.bitmap.width;
if (currentWidth > 0) {
var ratio = newWidth / currentWidth;
image.scale(ratio, function(err, image){
if (err) {
debug('Could not resize image');
debug(err);
deferred.reject(err);
} else {
debug('Image correctly resized');
deferred.resolve(image);
}
});
} else {
deferred.reject('Could not resize an empty image');
}
return deferred.promise;
};
this.toBuffer = function(image) {
var deferred = Q.defer();
image.quality(85).getBuffer(Jimp.MIME_JPEG, function(err, buffer){
if (err) {
debug('Could not save image to buffer');
debug(err);
deferred.reject(err);
} else {
debug('Image correctly transformed to buffer');
deferred.resolve(buffer);
}
});
return deferred.promise;
this.findAndOptimizeScreenshot = async function(tmpScreenshotPath, width) {
return sharp(tmpScreenshotPath)
.resize({width: 600})
.jpeg({quality: 85})
.toBuffer();
};