restructure directories

www.js is our 'main' file, it's now at the project's root instead of server.js
routes, views, assets are now in lib, too

lib/routes/avatars.js

@@ -0,0 +1,111 @@
+var logging = require("../logging");
+var helpers = require("../helpers");
+var config = require("../config");
+var skins = require("../skins");
+var cache = require("../cache");
+
+var human_status = {
+  0: "none",
+  1: "cached",
+  2: "downloaded",
+  3: "checked",
+  "-1": "error"
+};
+
+// GET avatar request
+module.exports = function(req, res) {
+  var start = new Date();
+  var userId = (req.url.path_list[2] || "").split(".")[0];
+  var size = parseInt(req.url.query.size) || config.default_size;
+  var def = req.url.query.default;
+  var helm = req.url.query.hasOwnProperty("helm");
+  var etag = null;
+  var rid = req.id;
+
+  function sendimage(rid, http_status, img_status, image) {
+    logging.log(rid, "status:", http_status);
+    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": human_status[img_status],
+      "X-Request-ID": rid,
+      "Access-Control-Allow-Origin": "*",
+      "Etag": '"' + etag + '"'
+    });
+    res.end(http_status === 304 ? null : image);
+  }
+
+  function handle_default(rid, http_status, img_status, userId) {
+    if (def && def !== "steve" && def !== "alex") {
+      logging.log(rid, "status: 301");
+      res.writeHead(301, {
+        "Cache-Control": "max-age=" + config.browser_cache_time + ", public",
+        "Response-Time": new Date() - start,
+        "X-Storage-Type": human_status[img_status],
+        "X-Request-ID": rid,
+        "Access-Control-Allow-Origin": "*",
+        "Location": def
+      });
+      res.end();
+    } else {
+      def = def || skins.default_skin(userId);
+      skins.resize_img("public/images/" + def + ".png", size, function(err, image) {
+        sendimage(rid, http_status, img_status, image);
+      });
+    }
+  }
+
+  // Prevent app from crashing/freezing
+  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.writeHead(422, {
+      "Content-Type": "text/plain",
+      "Response-Time": new Date() - start
+    });
+    res.end("Invalid Size");
+    return;
+  } else if (!helpers.id_valid(userId)) {
+    res.writeHead(422, {
+      "Content-Type": "text/plain",
+      "Response-Time": new Date() - start
+    });
+    res.end("Invalid ID");
+    return;
+  }
+
+  // strip dashes
+  userId = userId.replace(/-/g, "");
+  logging.log(rid, "userid:", userId);
+
+
+  try {
+    helpers.get_avatar(rid, userId, helm, size, function(err, status, image, hash) {
+      logging.log(rid, "storage type:", human_status[status]);
+      if (err) {
+        logging.error(rid, err);
+        if (err.code === "ENOENT") {
+          // no such file
+          cache.remove_hash(rid, userId);
+        }
+      }
+      etag = image && hash && hash.substr(0, 32) || "none";
+      var matches = req.headers["if-none-match"] === '"' + etag + '"';
+      if (image) {
+        var http_status = 200;
+        if (err) {
+          http_status = 503;
+        }
+        logging.debug(rid, "etag:", req.headers["if-none-match"]);
+        logging.debug(rid, "matches:", matches);
+        sendimage(rid, matches ? 304 : http_status, status, image);
+      } else {
+        handle_default(rid, matches ? 304 : 200, status, userId);
+      }
+    });
+  } catch(e) {
+    logging.error(rid, "error:", e.stack);
+    handle_default(rid, 500, -1, userId);
+  }
+};

lib/routes/capes.js

@@ -0,0 +1,91 @@
+var logging = require("../logging");
+var helpers = require("../helpers");
+var config = require("../config");
+var cache = require("../cache");
+
+var human_status = {
+  0: "none",
+  1: "cached",
+  2: "downloaded",
+  3: "checked",
+  "-1": "error"
+};
+
+// GET cape request
+module.exports = function(req, res) {
+  var start = new Date();
+  var userId = (req.url.pathname.split("/")[2] || "").split(".")[0];
+  var etag = null;
+  var rid = req.id;
+
+  function sendimage(rid, http_status, img_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": human_status[img_status],
+      "X-Request-ID": rid,
+      "Access-Control-Allow-Origin": "*",
+      "Etag": '"' + etag + '"'
+    });
+    res.end(http_status === 304 ? null : image);
+  }
+
+  if (!helpers.id_valid(userId)) {
+    res.writeHead(422, {
+      "Content-Type": "text/plain",
+      "Response-Time": new Date() - start
+    });
+    res.end("Invalid ID");
+    return;
+  }
+
+  // strip dashes
+  userId = userId.replace(/-/g, "");
+  logging.log(rid, "userid:", userId);
+
+  try {
+    helpers.get_cape(rid, userId, function(err, status, image, hash) {
+      logging.log(rid, "storage type:", human_status[status]);
+      if (err) {
+        logging.error(rid, err);
+        if (err.code === "ENOENT") {
+          // no such file
+          cache.remove_hash(rid, userId);
+        }
+      }
+      etag = hash && hash.substr(0, 32) || "none";
+      var matches = req.headers["if-none-match"] === '"' + etag + '"';
+      if (image) {
+        var http_status = 200;
+        if (err) {
+          http_status = 503;
+        }
+        logging.debug(rid, "etag:", req.headers["if-none-match"]);
+        logging.debug(rid, "matches:", matches);
+        logging.log(rid, "status:", http_status);
+        sendimage(rid, matches ? 304 : http_status, status, image);
+      } else if (matches) {
+        res.writeHead(304, {
+          "Etag": '"' + etag + '"',
+          "Response-Time": new Date() - start
+        });
+        res.end();
+      } else {
+        res.writeHead(404, {
+          "Content-Type": "text/plain",
+          "Etag": '"' + etag + '"',
+          "Response-Time": new Date() - start
+        });
+        res.end("404 not found");
+      }
+    });
+  } catch(e) {
+    logging.error(rid, "error:" + e.stack);
+    res.writeHead(500, {
+      "Content-Type": "text/plain",
+      "Response-Time": new Date() - start
+    });
+    res.end("500 server error");
+  }
+};

lib/routes/index.js

@@ -0,0 +1,19 @@
+var config = require("../config");
+var path = require("path");
+var jade = require("jade");
+
+// compile jade
+var index = jade.compileFile(path.join(__dirname, "../views/index.jade"));
+
+module.exports = function(req, res) {
+  var html = index({
+    title: "Crafatar",
+    domain: "https://" + req.headers.host,
+    config: config
+  });
+  res.writeHead(200, {
+    "Content-Length": Buffer.byteLength(html, "UTF-8"),
+    "Content-Type": "text/html; charset=utf-8"
+  });
+  res.end(html);
+};

lib/routes/renders.js

@@ -0,0 +1,139 @@
+var logging = require("../logging");
+var helpers = require("../helpers");
+var config = require("../config");
+var cache = require("../cache");
+var skins = require("../skins");
+var renders = require("../renders");
+var fs = require("fs");
+
+var human_status = {
+  0: "none",
+  1: "cached",
+  2: "downloaded",
+  3: "checked",
+  "-1": "error"
+};
+
+// valid types: head, body
+// helmet is query param
+// TODO: The Type logic should be two separate GET functions once response methods are extracted
+
+// GET render request
+module.exports = function(req, res) {
+  var start = new Date();
+  var raw_type = (req.url.path_list[2] || "");
+  var rid = req.id;
+
+  // validate type
+  if (raw_type !== "body" && raw_type !== "head") {
+    res.writeHead(422, {
+      "Content-Type": "text/plain",
+      "Response-Time": new Date() - start
+    });
+    res.end("Invalid Render Type");
+    return;
+  }
+
+  var body = raw_type === "body";
+  var userId = (req.url.path_list[3] || "").split(".")[0];
+  var def = req.url.query.default;
+  var scale = parseInt(req.url.query.scale) || config.default_scale;
+  var helm = req.url.query.hasOwnProperty("helm");
+  var etag = null;
+
+  function sendimage(rid, http_status, img_status, image) {
+    logging.log(rid, "status:", http_status);
+    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": human_status[img_status],
+      "X-Request-ID": rid,
+      "Access-Control-Allow-Origin": "*",
+      "Etag": '"' + etag + '"'
+    });
+    res.end(http_status === 304 ? null : image);
+  }
+
+  // default alex/steve images can be rendered, but
+  // custom images will not be
+  function handle_default(rid, http_status, img_status, userId) {
+    if (def && def !== "steve" && def !== "alex") {
+      logging.log(rid, "status: 301");
+      res.writeHead(301, {
+        "Cache-Control": "max-age=" + config.browser_cache_time + ", public",
+        "Response-Time": new Date() - start,
+        "X-Storage-Type": human_status[img_status],
+        "X-Request-ID": rid,
+        "Access-Control-Allow-Origin": "*",
+        "Location": def
+      });
+      res.end();
+    } else {
+      def = def || skins.default_skin(userId);
+      fs.readFile("public/images/" + def + "_skin.png", function (err, buf) {
+        if (err) {
+          // errored while loading the default image, continuing with null image
+          logging.error(rid, "error loading default render image:", err);
+        }
+        // we render the default skins, but not custom images
+        renders.draw_model(rid, buf, scale, helm, body, function(render_err, def_img) {
+          if (render_err) {
+            logging.error(rid, "error while rendering default image:", render_err);
+          }
+          sendimage(rid, http_status, img_status, def_img);
+        });
+      });
+    }
+  }
+
+  if (scale < config.min_scale || scale > config.max_scale) {
+    res.writeHead(422, {
+      "Content-Type": "text/plain",
+      "Response-Time": new Date() - start
+    });
+    res.end("422 Invalid Scale");
+    return;
+  } else if (!helpers.id_valid(userId)) {
+    res.writeHead(422, {
+      "Content-Type": "text/plain",
+      "Response-Time": new Date() - start
+    });
+    res.end("422 Invalid ID");
+    return;
+  }
+
+  // strip dashes
+  userId = userId.replace(/-/g, "");
+  logging.log(rid, "userId:", userId);
+
+  try {
+    helpers.get_render(rid, userId, scale, helm, body, function(err, status, hash, image) {
+      logging.log(rid, "storage type:", human_status[status]);
+      if (err) {
+        logging.error(rid, err);
+        if (err.code === "ENOENT") {
+          // no such file
+          cache.remove_hash(rid, userId);
+        }
+      }
+      etag = hash && hash.substr(0, 32) || "none";
+      var matches = req.headers["if-none-match"] === '"' + etag + '"';
+      if (image) {
+        var http_status = 200;
+        if (err) {
+          http_status = 503;
+        }
+        logging.debug(rid, "etag:", req.headers["if-none-match"]);
+        logging.debug(rid, "matches:", matches);
+        sendimage(rid, matches ? 304 : http_status, status, image);
+      } else {
+        logging.log(rid, "image not found, using default.");
+        handle_default(rid, matches ? 304 : 200, status, userId);
+      }
+    });
+  } catch(e) {
+    logging.error(rid, "error:", e.stack);
+    handle_default(rid, 500, -1, userId);
+  }
+};

lib/routes/skins.js

@@ -0,0 +1,90 @@
+var logging = require("../logging");
+var helpers = require("../helpers");
+var config = require("../config");
+var skins = require("../skins");
+var path = require("path");
+var lwip = require("lwip");
+
+// GET skin request
+module.exports = function(req, res) {
+  var start = new Date();
+  var userId = (req.url.path_list[2] || "").split(".")[0];
+  var def = req.url.query.default;
+  var etag = null;
+  var rid = req.id;
+
+  function sendimage(rid, http_status, image) {
+    logging.log(rid, "status:", http_status);
+    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",
+      "X-Request-ID": rid,
+      "Access-Control-Allow-Origin": "*",
+      "Etag": '"' + etag + '"'
+    });
+    res.end(http_status === 304 ? null : image);
+  }
+
+  function handle_default(rid, http_status, userId) {
+    if (def && def !== "steve" && def !== "alex") {
+      logging.log(rid, "status: 301");
+      res.writeHead(301, {
+        "Cache-Control": "max-age=" + config.browser_cache_time + ", public",
+        "Response-Time": new Date() - start,
+        "X-Storage-Type": "downloaded",
+        "X-Request-ID": rid,
+        "Access-Control-Allow-Origin": "*",
+        "Location": def
+      });
+      res.end();
+    } else {
+      def = def || skins.default_skin(userId);
+      lwip.open(path.join(__dirname, "..", "public", "images", def + "_skin.png"), function(err, image) {
+        // FIXME: err is not handled
+        image.toBuffer("png", function(buf_err, buffer) {
+          // FIXME: buf_err is not handled
+          sendimage(rid, http_status, buffer);
+        });
+      });
+    }
+  }
+
+  if (!helpers.id_valid(userId)) {
+    res.writeHead(422, {
+      "Content-Type": "text/plain",
+      "Response-Time": new Date() - start
+    });
+    res.end("Invalid ID");
+    return;
+  }
+
+  // strip dashes
+  userId = userId.replace(/-/g, "");
+  logging.log(rid, "userid:", userId);
+
+  try {
+    helpers.get_skin(rid, userId, function(err, hash, image) {
+      if (err) {
+        logging.error(rid, err);
+      }
+      etag = hash && hash.substr(0, 32) || "none";
+      var matches = req.headers["if-none-match"] === '"' + etag + '"';
+      if (image) {
+        var http_status = 200;
+        if (err) {
+          http_status = 503;
+        }
+        logging.debug(rid, "etag:", req.headers["if-none-match"]);
+        logging.debug(rid, "matches:", matches);
+        sendimage(rid, matches ? 304 : http_status, image);
+      } else {
+        handle_default(rid, 200, userId);
+      }
+    });
+  } catch(e) {
+    logging.error(rid, "error:", e.stack);
+    handle_default(rid, 500, userId);
+  }
+};