split code into more modules, fixes #8

routes/avatars.js

@@ -1,78 +1,60 @@
-var express = require('express');
-var router = express.Router();
-var skins = require('../skins');
+var networking = require('../modules/networking');
+var helpers = require('../modules/helpers');
+var router = require('express').Router();
+var config = require('../modules/config');
+var skins = require('../modules/skins');
 var fs = require('fs');
 
-var valid_uuid = /^[0-9a-f]{32}$/;
-
-/* GET home page. */
+/* GET avatar request. */
 router.get('/:uuid/:size?', function(req, res) {
   var uuid = req.param('uuid');
-  var size = req.param('size') || 180;
+  var size = req.param('size') || config.default_size;
   var def = req.query.default;
   var start = new Date();
+
   // Prevent app from crashing/freezing
-  if (size <= 0 || size > 512) size = 180;
-  if (valid_uuid.test(uuid)) {
-    var filename = uuid + ".png";
-    if (fs.existsSync("skins/" + filename)) {
-      console.log('found ' + filename);
-      skins.resize_img("skins/" + filename, size, function(data) {
-        // tell browser to cache image locally for 10 minutes
-        var end = new Date() - start;
-        res.writeHead(200, {'Content-Type': 'image/png', 'Cache-Control': 'max-age=600, public', 'Response-Time': end, 'Storage-Type': 'local'});
-        res.end(data);
+  if (size <= config.min_size || size > config.max_size) {
+    // "Unprocessable Entity", valid request, but semantically erroneous:
+    // https://tools.ietf.org/html/rfc4918#page-78
+    res.status(422).send("422 Invalid size");
+    return;
+  } else if (!helpers.uuid_valid(uuid)) {
+    res.status(422).send("422 Invalid UUID");
+    return;
+  }
+
+  helpers.get_avatar(uuid, size, function(err, status, image) {
+    if (err) {
+      throw err;
+    } else if (status == 1 || status == 2) {
+      var time = new Date() - start;
+      sendimage(200, time, image);
+    } else if (status == 3) {
+      handle_404(def);
+    }
+  });
+
+  function handle_404(def) {
+    if (def == "alex" || def == "steve") {
+      skins.resize_img("public/images/" + def + ".png", size, function(image) {
+        var time = new Date() - start;
+        sendimage(404, time, image);
       });
     } else {
-      console.log(filename + ' not found, downloading profile..');
-      skins.get_profile(uuid, function(profile) {
-        var skinurl = skins.skin_url(profile);
-        if (skinurl) {
-          console.log('got profile, skin url is "' + skinurl + '" downloading..');
-          skins.skin_file(skinurl, "skins/" + filename, function() {
-            console.log('got skin');
-            skins.resize_img("skins/" + filename, size, function(data) {
-              // tell browser to cache image locally for 10 minutes
-              var end = new Date() - start;
-              res.writeHead(200, {
-                'Content-Type': 'image/png',
-                'Cache-Control': 'max-age=600, public',
-                'Response-Time': end,
-                'Storage-Type': 'downloaded'
-              });
-              res.end(data);
-            });
-          });
-        } else {
-          console.log('no skin url found');
-          switch (def) {
-            case "alex":
-              skins.resize_img("public/images/alex.png", size, function(data) {
-                // tell browser to cache image locally for 10 minutes
-                var end = new Date() - start;
-                res.writeHead(404, {'Content-Type': 'image/png', 'Cache-Control': 'max-age=600, public', 'Response-Time': end, 'Storage-Type': 'local'});
-                res.end(data);
-              });
-              break;
-            case "steve":
-              skins.resize_img("public/images/steve.png", size, function(data) {
-                // tell browser to cache image locally for 10 minutes
-                var end = new Date() - start;
-                res.writeHead(404, {'Content-Type': 'image/png', 'Cache-Control': 'max-age=600, public', 'Response-Time': end, 'Storage-Type': 'local'});
-                res.end(data);
-              });
-              break;
-            default:
-              res.status(404).send('404 Not found');
-              break;
-          }
-        }
-      });
+      res.status(404).send('404 Not found');
     }
-  } else {
-    res.status(422) // "Unprocessable Entity", valid request, but semantically erroneous: https://tools.ietf.org/html/rfc4918#page-78
-    .send("422 Invalid UUID");
+  }
+
+  function sendimage(status, time, image) {
+    res.writeHead(status, {
+      'Content-Type': 'image/png',
+      'Cache-Control': 'max-age=' + config.browser_cache_time + ', public',
+      'Response-Time': time,
+      'X-Storage-Type': 'local'
+    });
+    res.end(image);
   }
 });
 
-module.exports = router;
+
+module.exports = router;

routes/index.js

@@ -7,4 +7,4 @@ router.get('/', function(req, res) {
 });
 
 
-module.exports = router;
+module.exports = router;