From ef2a1f5929a39267f521bde81d765b0ba7666e1d Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Tue, 22 Mar 2016 22:45:18 -0500 Subject: [PATCH] chore: Update pageres Removes dependency on memoize-async, which was unpublished: https://medium.com/@azerbike/i-ve-just-liberated-my-modules-9045c06be67c#.tlcdr5ieg --- package.json | 2 +- website/src/controllers/dataexport.js | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9a9d55d313..92829aa00e 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "newrelic": "~1.25.0", "nib": "~1.0.1", "nodemailer": "~0.5.2", - "pageres": "^1.0.1", + "pageres": "^4.1.1", "passport": "~0.2.1", "passport-facebook": "2.0.0", "paypal-ipn": "2.1.0", diff --git a/website/src/controllers/dataexport.js b/website/src/controllers/dataexport.js index 1c88d2d90f..c599c7758b 100644 --- a/website/src/controllers/dataexport.js +++ b/website/src/controllers/dataexport.js @@ -115,9 +115,8 @@ dataexport.avatarImage = function(req, res, next) { return res.redirect(301, 'https://' + bucket + '.s3.amazonaws.com/' + filename); new Pageres()//{delay:1} .src(nconf.get('BASE_URL') + '/export/avatar-' + req.params.uuid + '.html', ['140x147'], {crop: true, filename: filename.replace('.png', '')}) - .run(function (err, file) { - if (err) return next(err); - // see http://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html#createMultipartUpload-property + .run() + .then(function (file) { var upload = s3Stream.upload({ Bucket: bucket, Key: filename, @@ -133,6 +132,6 @@ dataexport.avatarImage = function(req, res, next) { res.redirect(details.Location); }); file[0].pipe(upload); - }); + }).catch(next); }) };