azures04/crafatar
1
0
Fork 0
mirror of https://github.com/azures04/crafatar.git synced 2026-03-21 23:41:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

start work on #45

Browse Source
This commit is contained in:
jomo 2015-04-12 19:53:34 +02:00
parent 9d2fe0c454
commit fce58722c8
2 changed files with 35 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
lib/routes/avatars.js
View File

@ -12,81 +12,48 @@ var human_status = {
"-1": "error"
};
function handle_default(http_status, img_status, userId, size, def, callback) {
if (def && def !== "steve" && def !== "alex") {
callback(http_status, img_status, 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);
});
}
}
// GET avatar request
module.exports = function(req, res) {
var start = new Date();
module.exports = function(req, callback) {
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");
callback(422, 0, "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");
callback(422, 0, "Invalid ID");
return;
}
// strip dashes
userId = userId.replace(/-/g, "");
logging.debug(rid, "userid:", userId);
logging.debug(req.id, "userid:", userId);
try {
helpers.get_avatar(rid, userId, helm, size, function(err, status, image, hash) {
logging.log(rid, "storage type:", human_status[status]);
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(rid, err);
logging.error(req.id, err);
if (err.code === "ENOENT") {
// no such file
cache.remove_hash(rid, userId);
cache.remove_hash(req.id, userId);
}
}
etag = image && hash && hash.substr(0, 32) || "none";
@ -96,15 +63,15 @@ module.exports = function(req, res) {
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);
logging.debug(req.id, "etag:", req.headers["if-none-match"]);
logging.debug(req.id, "matches:", matches);
callback(matches ? 304 : http_status, status, image);
} else {
handle_default(rid, matches ? 304 : 200, status, userId);
handle_default(matches ? 304 : 200, status, userId, size, def, callback);
}
});
} catch(e) {
logging.error(rid, "error:", e.stack);
handle_default(rid, 500, -1, userId);
logging.error(req.id, "error:", e.stack);
handle_default(500, -1, userId, size, def, callback);
}
};

12
lib/server.js
View File

@ -21,7 +21,10 @@ function asset_request(req, res) {
var filename = path.join(__dirname, "public", req.url.path_list.join("/"));
fs.exists(filename, function(exists) {
if (exists) {
res.writeHead(200, { "Content-type": mime.lookup(filename) });
res.writeHead(200, {
"Content-type": mime.lookup(filename),
"Cache-Control": "max-age=7200, public", // cache for 2 hours
});
fs.createReadStream(filename).pipe(res);
} else {
res.writeHead(404, {
@ -48,6 +51,8 @@ function requestHandler(req, res) {
// generate 12 character random string
request.id = Math.random().toString(36).substring(2, 14);
res.start = new Date();
var local_path = request.url.path_list[1];
logging.log(request.id, request.method, request.url.href);
if (request.method === "GET" || request.method === "HEAD") {
@ -57,7 +62,10 @@ function requestHandler(req, res) {
routes.index(request, res);
break;
case "avatars":
routes.avatars(request, res);
routes.avatars(request, function(http_status, img_status, body) {
res.writeHead(http_status, {});
res.end(body);
});
break;
case "skins":
routes.skins(request, res);