azures04/crafatar
1
0
Fork 0
mirror of https://github.com/azures04/crafatar.git synced 2026-03-22 07:51:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

always use etag, fixes #94

Browse Source
This commit is contained in:
jomo 2015-03-28 01:51:59 +01:00
parent eeb1939235
commit 9e3ef8087e
4 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
routes/avatars.js
View File

@ -36,6 +36,26 @@ module.exports = function(req, res) {
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:
@ -74,40 +94,18 @@ module.exports = function(req, res) {
var matches = req.headers["if-none-match"] === '"' + etag + '"';
if (image) {
var http_status = 200;
if (matches) {
http_status = 304;
} else if (err) {
if (err) {
http_status = 503;
}
logging.debug(rid, "etag:", req.headers["if-none-match"]);
logging.debug(rid, "matches:", matches);
sendimage(rid, http_status, status, image);
sendimage(rid, matches ? 304 : http_status, status, image);
} else {
handle_default(rid, 200, status, userId);
handle_default(rid, matches ? 304 : 200, status, userId);
}
});
} catch(e) {
logging.error(rid, "error:", e.stack);
handle_default(rid, 500, -1, userId);
}
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);
});
}
}
};

13
routes/capes.js
View File

@ -58,18 +58,23 @@ module.exports = function(req, res) {
var matches = req.headers["if-none-match"] === '"' + etag + '"';
if (image) {
var http_status = 200;
if (matches) {
http_status = 304;
} else if (err) {
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, http_status, status, image);
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");

8
routes/renders.js
View File

@ -121,17 +121,15 @@ module.exports = function(req, res) {
var matches = req.headers["if-none-match"] === '"' + etag + '"';
if (image) {
var http_status = 200;
if (matches) {
http_status = 304;
} else if (err) {
if (err) {
http_status = 503;
}
logging.debug(rid, "etag:", req.headers["if-none-match"]);
logging.debug(rid, "matches:", matches);
sendimage(rid, http_status, status, image);
sendimage(rid, matches ? 304 : http_status, status, image);
} else {
logging.log(rid, "image not found, using default.");
handle_default(rid, 200, status, userId);
handle_default(rid, matches ? 304 : 200, status, userId);
}
});
} catch(e) {

6
routes/skins.js
View File

@ -72,14 +72,12 @@ module.exports = function(req, res) {
var matches = req.headers["if-none-match"] === '"' + etag + '"';
if (image) {
var http_status = 200;
if (matches) {
http_status = 304;
} else if (err) {
if (err) {
http_status = 503;
}
logging.debug(rid, "etag:", req.headers["if-none-match"]);
logging.debug(rid, "matches:", matches);
sendimage(rid, http_status, image);
sendimage(rid, matches ? 304 : http_status, image);
} else {
handle_default(rid, 200, userId);
}