merge :octocat:

Procfile

@@ -1 +1 @@
-web: cp "modules/config.example.js" "modules/config.js" && npm start
+web: cp "modules/config.example.js" "modules/config.js" && node server.js

modules/helpers.js

@@ -152,4 +152,22 @@ exp.get_avatar = function(uuid, helm, size, callback) {
   });
 };
 
+exp.get_skin = function(uuid, callback) {
+  logging.log("\nskin request: " + uuid);
+  exp.get_image_hash(uuid, function(err, status, hash) {
+    if (hash) {
+      var skinurl = "http://textures.minecraft.net/texture/" + hash;
+      networking.get_skin(skinurl, function(err, img) {
+        if (err) {
+          logging.log("\nerror while downloading skin");
+          callback(err, hash, null);
+        } else {
+          logging.log("\nreturning skin");
+          callback(null, hash, img);
+        }
+      });
+    }
+  });
+};
+
 module.exports = exp;

routes/skins.js

@@ -0,0 +1,84 @@
+var router = require('express').Router();
+var networking = require('../modules/networking');
+var logging = require('../modules/logging');
+var helpers = require('../modules/helpers');
+var config = require('../modules/config');
+var skins = require('../modules/skins');
+
+/* GET skin request. */
+router.get('/:uuid.:ext?', function(req, res) {
+  var uuid = req.params.uuid;
+  var def = req.query.default;
+  var start = new Date();
+  var etag = null;
+
+  if (!helpers.uuid_valid(uuid)) {
+    res.status(422).send("422 Invalid UUID");
+    return;
+  }
+
+  // strip dashes
+  uuid = uuid.replace(/-/g, "");
+
+  try {
+    helpers.get_skin(uuid, function(err, hash, image) {
+      logging.log(uuid);
+      if (err) {
+        logging.error(err);
+      }
+      etag = hash && hash.substr(0, 32) || "none";
+      var matches = req.get("If-None-Match") == '"' + etag + '"';
+      if (image) {
+        var http_status = 200;
+        if (matches) {
+          http_status = 304;
+        } else if (err) {
+          http_status = 503;
+        }
+        logging.log("matches: " + matches);
+        logging.log("Etag: " + req.get("If-None-Match"));
+        logging.log("status: " + http_status);
+        sendimage(http_status, image);
+      } else {
+        handle_default(404);
+      }
+    });
+  } catch(e) {
+    logging.error("Error!");
+    logging.error(e);
+    handle_default(500);
+  }
+
+  function handle_default(http_status) {
+    if (def && def != "steve" && def != "alex") {
+      res.writeHead(301, {
+        'Cache-Control': 'max-age=' + config.browser_cache_time + ', public',
+        'Response-Time': new Date() - start,
+        'X-Storage-Type': "downloaded",
+        'Access-Control-Allow-Origin': '*',
+        'Location': def
+      });
+      res.end();
+    } else {
+      def = def || skins.default_skin(uuid);
+      skins.resize_img("public/images/" + def + ".png", size, function(err, image) {
+        sendimage(http_status, image);
+      });
+    }
+  }
+
+  function sendimage(http_status, image) {
+    res.writeHead(http_status, {
+      'Content-Type': 'image/png',
+      'Cache-Control': 'max-age=' + config.browser_cache_time + ', public',
+      'Response-Time': new Date() - start,
+      'X-Storage-Type': "downloaded",
+      'Access-Control-Allow-Origin': '*',
+      'Etag': '"' + etag + '"'
+    });
+    res.end(http_status == 304 ? null : image);
+  }
+});
+
+
+module.exports = router;