From 3e21e1f4483ecbe516c8ba8db835dae49ad71da9 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 11 Nov 2014 17:04:53 -0700
Subject: [PATCH] feat(sharing): implement caching of avatar img. img as
 image/png instead of octet/stream

---
 src/controllers/dataexport.js   | 13 ++++++++++---
 views/shared/header/avatar.jade |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/controllers/dataexport.js b/src/controllers/dataexport.js
index 0ee176bbe2..2b2a5b8d0f 100644
--- a/src/controllers/dataexport.js
+++ b/src/controllers/dataexport.js
@@ -14,6 +14,7 @@ var AWS = require('aws-sdk');
 AWS.config.update({accessKeyId: nconf.get("S3").accessKeyId, secretAccessKey: nconf.get("S3").secretAccessKey});
 var s3Stream = require('s3-upload-stream')(new AWS.S3()); //https://github.com/nathanpeck/s3-upload-stream
 var bucket = 'habitrpg-dev';
+var request = require('request');
 
 /*
   ------------------------------------------------------------------------
@@ -108,8 +109,12 @@ dataexport.avatarPage = function(req, res) {
 
 dataexport.avatarImage = function(req, res, next) {
   var filename = 'avatar-'+req.params.uuid+'.png';
-  new Pageres()//{delay:1}
-    .src(nconf.get('BASE_URL')+'/export/avatar-'+req.params.uuid+'.html', ['140x147'], {crop: true, filename: filename.replace('.png','')})
+  request.head('https://'+bucket+'.s3.amazonaws.com/'+filename, function(err,response,body) {
+    // cache images for 10 minutes on aws, else upload a new one
+    if (response.statusCode==200 && moment().diff(response.headers['last-modified'], 'minutes') < 10)
+      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);
       var upload = s3Stream.upload({
@@ -117,7 +122,8 @@ dataexport.avatarImage = function(req, res, next) {
         Key: filename,
         ACL: "public-read",
         StorageClass: "REDUCED_REDUNDANCY",
-        ContentType: "binary/octet-stream"
+        ContentType: "image/png",
+        Expires: +moment().add({minutes: 3})
       });
       upload.on('error', function (err) {
         next(err);
@@ -127,4 +133,5 @@ dataexport.avatarImage = function(req, res, next) {
       });
       file[0].pipe(upload);
     });
+  })
 };
diff --git a/views/shared/header/avatar.jade b/views/shared/header/avatar.jade
index 4bec44df16..3c03ac1131 100644
--- a/views/shared/header/avatar.jade
+++ b/views/shared/header/avatar.jade
@@ -7,7 +7,7 @@ mixin avatar(opts)
 
   .character-sprites
 
-    .addthis_native_toolbox(ng-if='profile._id==user._id', data-url="#{env.BASE_URL}/export/avatar-{{profile._id}}.html", data-title="Check out my HabitRPG progress!")
+    .addthis_native_toolbox(ng-if='profile._id==user._id', data-url="#{env.BASE_URL}/export/avatar-{{profile._id}}.png", data-title="Check out my HabitRPG progress!")
 
     // Mount Body
     if !opts.minimal