azures04/crafatar
1
0
Fork 0
mirror of https://github.com/azures04/crafatar.git synced 2026-05-06 11:00:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

create new response module & use it for avatars

Browse Source
This commit is contained in:
jomo
2015-04-20 00:41:11 +02:00
parent fce58722c8
commit 3cbf73b0d7
5 changed files with 157 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
lib/routes/avatars.js
View File

@@ -3,22 +3,23 @@ var helpers = require("../helpers");
var config = require("../config");
var skins = require("../skins");
var cache = require("../cache");
var path = require("path");
var human_status = {
0: "none",
1: "cached",
2: "downloaded",
3: "checked",
"-1": "error"
};
function handle_default(http_status, img_status, userId, size, def, callback) {
function handle_default(img_status, userId, size, def, callback) {
if (def && def !== "steve" && def !== "alex") {
callback(http_status, img_status, def);
callback({
status: img_status,
redirect: def
});
} else {
def = def || skins.default_skin(userId);
skins.resize_img("public/images/" + def + ".png", size, function(err, image) {
callback(http_status, img_status, image);
skins.resize_img(path.join(__dirname, "..", "public", "images", def + ".png"), size, function(err, image) {
callback({
status: img_status,
body: image,
type: "image/png",
err: err
});
});
}
}
@@ -29,16 +30,21 @@ module.exports = function(req, callback) {
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;
// 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
callback(422, 0, "Invalid Size");
callback({
status: -2,
body: "Invalid Size"
});
return;
} else if (!helpers.id_valid(userId)) {
callback(422, 0, "Invalid ID");
callback({
status: -2,
body: "Invalid userid"
});
return;
}
@@ -48,7 +54,6 @@ module.exports = function(req, callback) {
try {
helpers.get_avatar(req.id, userId, helm, size, function(err, status, image, hash) {
logging.log(req.id, "storage type:", human_status[status]);
if (err) {
logging.error(req.id, err);
if (err.code === "ENOENT") {
@@ -56,22 +61,20 @@ module.exports = function(req, callback) {
cache.remove_hash(req.id, 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(req.id, "etag:", req.headers["if-none-match"]);
logging.debug(req.id, "matches:", matches);
callback(matches ? 304 : http_status, status, image);
callback({
status: status,
body: image,
type: "image/png",
err: err,
hash: hash
});
} else {
handle_default(matches ? 304 : 200, status, userId, size, def, callback);
handle_default(status, userId, size, def, callback);
}
});
} catch(e) {
logging.error(req.id, "error:", e.stack);
handle_default(500, -1, userId, size, def, callback);
handle_default(-1, userId, size, def, callback);
}
};

5
lib/routes/renders.js
View File

@@ -1,9 +1,10 @@
var logging = require("../logging");
var helpers = require("../helpers");
var renders = require("../renders");
var config = require("../config");
var cache = require("../cache");
var skins = require("../skins");
var renders = require("../renders");
var path = require("path");
var fs = require("fs");
var human_status = {
@@ -71,7 +72,7 @@ module.exports = function(req, res) {
res.end();
} else {
def = def || skins.default_skin(userId);
fs.readFile("public/images/" + def + "_skin.png", function (err, buf) {
fs.readFile(path.join(__dirname, "..", "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);