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

Revert #62 to avoid conflicts with #77

Browse Source 
This reverts commit 6e03f0f55d.
This commit is contained in:
jomo
2015-01-31 17:57:21 +01:00
parent 8ce8b9d0d9
commit ebe88cdc48
10 changed files with 213 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
routes/avatars.js
View File

@@ -15,7 +15,7 @@ var human_status = {
// GET avatar request
module.exports = function(req, res) {
var start = new Date();
var id = (req.url.path_list[2] || "").split(".")[0];
var uuid = (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");
@@ -31,25 +31,25 @@ module.exports = function(req, res) {
});
res.end("Invalid Size");
return;
} else if (!helpers.id_valid(id)) {
} else if (!helpers.uuid_valid(uuid)) {
res.writeHead(422, {
"Content-Type": "text/plain",
"Response-Time": new Date() - start
});
res.end("Invalid ID");
res.end("Invalid UUID");
return;
}
// strip dashes
id = id.replace(/-/g, "");
uuid = uuid.replace(/-/g, "");
try {
helpers.get_avatar(id, helm, size, function(err, status, image, hash) {
logging.log(id + " - " + human_status[status]);
helpers.get_avatar(uuid, helm, size, function(err, status, image, hash) {
logging.log(uuid + " - " + human_status[status]);
if (err) {
logging.error(id + " " + err);
logging.error(uuid + " " + err);
if (err.code === "ENOENT") {
cache.remove_hash(id);
cache.remove_hash(uuid);
}
}
etag = image && hash && hash.substr(0, 32) || "none";
@@ -61,21 +61,21 @@ module.exports = function(req, res) {
} else if (err) {
http_status = 503;
}
logging.debug(id + " etag: " + req.headers["if-none-match"]);
logging.debug(id + " matches: " + matches);
sendimage(http_status, status, image, id);
logging.debug(uuid + " etag: " + req.headers["if-none-match"]);
logging.debug(uuid + " matches: " + matches);
sendimage(http_status, status, image, uuid);
} else {
handle_default(404, status, id);
handle_default(404, status, uuid);
}
});
} catch(e) {
logging.error(id + " error: " + e);
handle_default(500, status, id);
logging.error(uuid + " error: " + e);
handle_default(500, status, uuid);
}
function handle_default(http_status, img_status, id) {
function handle_default(http_status, img_status, uuid) {
if (def && def !== "steve" && def !== "alex") {
logging.log(id + " status: 301");
logging.log(uuid + " status: 301");
res.writeHead(301, {
"Cache-Control": "max-age=" + config.browser_cache_time + ", public",
"Response-Time": new Date() - start,
@@ -85,15 +85,15 @@ module.exports = function(req, res) {
});
res.end();
} else {
def = def || skins.default_skin(id);
def = def || skins.default_skin(uuid);
skins.resize_img("public/images/" + def + ".png", size, function(err, image) {
sendimage(http_status, img_status, image, id);
sendimage(http_status, img_status, image, uuid);
});
}
}
function sendimage(http_status, img_status, image, id) {
logging.log(id + " status: " + http_status);
function sendimage(http_status, img_status, image, uuid) {
logging.log(uuid + " status: " + http_status);
res.writeHead(http_status, {
"Content-Type": "image/png",
"Cache-Control": "max-age=" + config.browser_cache_time + ", public",

14
routes/capes.js
View File

@@ -13,10 +13,10 @@ var human_status = {
// GET cape request
module.exports = function(req, res) {
var start = new Date();
var id = (req.url.pathname.split("/")[2] || "").split(".")[0];
var uuid = (req.url.pathname.split("/")[2] || "").split(".")[0];
var etag = null;
if (!helpers.id_valid(id)) {
if (!helpers.uuid_valid(uuid)) {
res.writeHead(422, {
"Content-Type": "text/plain",
"Response-Time": new Date() - start
@@ -26,13 +26,13 @@ module.exports = function(req, res) {
}
// strip dashes
id = id.replace(/-/g, "");
uuid = uuid.replace(/-/g, "");
try {
helpers.get_cape(id, function(err, status, image, hash) {
logging.log(id + " - " + human_status[status]);
helpers.get_cape(uuid, function(err, status, image, hash) {
logging.log(uuid + " - " + human_status[status]);
if (err) {
logging.error(id + " " + err);
logging.error(uuid + " " + err);
}
etag = hash && hash.substr(0, 32) || "none";
var matches = req.headers["if-none-match"] === '"' + etag + '"';
@@ -56,7 +56,7 @@ module.exports = function(req, res) {
}
});
} catch(e) {
logging.error(id + " error:");
logging.error(uuid + " error:");
logging.error(e);
res.writeHead(500, {
"Content-Type": "text/plain",

40
routes/renders.js
View File

@@ -33,7 +33,7 @@ module.exports = function(req, res) {
}
var body = raw_type === "body";
var id = (req.url.path_list[3] || "").split(".")[0];
var uuid = (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");
@@ -46,23 +46,23 @@ module.exports = function(req, res) {
});
res.end("422 Invalid Scale");
return;
} else if (!helpers.id_valid(id)) {
} else if (!helpers.uuid_valid(uuid)) {
res.writeHead(422, {
"Content-Type": "text/plain",
"Response-Time": new Date() - start
});
res.end("422 Invalid ID");
res.end("422 Invalid UUID");
return;
}
// strip dashes
id = id.replace(/-/g, "");
uuid = uuid.replace(/-/g, "");
try {
helpers.get_render(id, scale, helm, body, function(err, status, hash, image) {
logging.log(id + " - " + human_status[status]);
helpers.get_render(uuid, scale, helm, body, function(err, status, hash, image) {
logging.log(uuid + " - " + human_status[status]);
if (err) {
logging.error(id + " " + err);
logging.error(uuid + " " + err);
}
etag = hash && hash.substr(0, 32) || "none";
var matches = req.headers["if-none-match"] === '"' + etag + '"';
@@ -73,25 +73,25 @@ module.exports = function(req, res) {
} else if (err) {
http_status = 503;
}
logging.debug(id + " etag: " + req.headers["if-none-match"]);
logging.debug(id + " matches: " + matches);
logging.debug(uuid + " etag: " + req.headers["if-none-match"]);
logging.debug(uuid + " matches: " + matches);
sendimage(http_status, status, image, uuid);
} else {
logging.log(id + " image not found, using default.");
logging.log(uuid + " image not found, using default.");
handle_default(404, status, uuid);
}
});
} catch(e) {
logging.error(id + " error: " + e);
logging.error(uuid + " error: " + e);
handle_default(500, status, uuid);
}
// default alex/steve images can be rendered, but
// custom images will not be
function handle_default(http_status, img_status, id) {
function handle_default(http_status, img_status, uuid) {
if (def && def !== "steve" && def !== "alex") {
logging.log(id + " status: 301");
logging.log(uuid + " status: 301");
res.writeHead(301, {
"Cache-Control": "max-age=" + config.browser_cache_time + ", public",
"Response-Time": new Date() - start,
@@ -101,25 +101,25 @@ module.exports = function(req, res) {
});
res.end();
} else {
def = def || skins.default_skin(id);
def = def || skins.default_skin(uuid);
fs.readFile("public/images/" + def + "_skin.png", function (err, buf) {
if (err) {
// errored while loading the default image, continuing with null image
logging.error(id + "error loading default render image: " + err);
logging.error(uuid + "error loading default render image: " + err);
}
// we render the default skins, but not custom images
renders.draw_model(id, buf, scale, helm, body, function(err, def_img) {
renders.draw_model(uuid, buf, scale, helm, body, function(err, def_img) {
if (err) {
logging.log(id + "error while rendering default image: " + err);
logging.log(uuid + "error while rendering default image: " + err);
}
sendimage(http_status, img_status, def_img, id);
sendimage(http_status, img_status, def_img, uuid);
});
});
}
}
function sendimage(http_status, img_status, image, id) {
logging.log(id + " status: " + http_status);
function sendimage(http_status, img_status, image, uuid) {
logging.log(uuid + " status: " + http_status);
res.writeHead(http_status, {
"Content-Type": "image/png",
"Cache-Control": "max-age=" + config.browser_cache_time + ", public",

38
routes/skins.js
View File

@@ -7,27 +7,27 @@ var lwip = require("lwip");
// GET skin request
module.exports = function(req, res) {
var start = new Date();
var id = (req.url.path_list[2] || "").split(".")[0];
var uuid = (req.url.path_list[2] || "").split(".")[0];
var def = req.url.query.default;
var etag = null;
if (!helpers.id_valid(id)) {
if (!helpers.uuid_valid(uuid)) {
res.writeHead(422, {
"Content-Type": "text/plain",
"Response-Time": new Date() - start
});
res.end("Invalid ID");
res.end("Invalid UUID");
return;
}
// strip dashes
id = id.replace(/-/g, "");
uuid = uuid.replace(/-/g, "");
try {
helpers.get_skin(id, function(err, hash, image) {
logging.log(id);
helpers.get_skin(uuid, function(err, hash, image) {
logging.log(uuid);
if (err) {
logging.error(id + " " + err);
logging.error(uuid + " " + err);
}
etag = hash && hash.substr(0, 32) || "none";
var matches = req.headers["if-none-match"] === '"' + etag + '"';
@@ -38,21 +38,21 @@ module.exports = function(req, res) {
} else if (err) {
http_status = 503;
}
logging.debug(id + " etag: " + req.headers["if-none-match"]);
logging.debug(id + " matches: " + matches);
sendimage(http_status, image, id);
logging.debug(uuid + " etag: " + req.headers["if-none-match"]);
logging.debug(uuid + " matches: " + matches);
sendimage(http_status, image, uuid);
} else {
handle_default(404, id);
handle_default(404, uuid);
}
});
} catch(e) {
logging.error(id + " error: " + e);
handle_default(500, id);
logging.error(uuid + " error: " + e);
handle_default(500, uuid);
}
function handle_default(http_status, id) {
function handle_default(http_status, uuid) {
if (def && def !== "steve" && def !== "alex") {
logging.log(id + " status: 301");
logging.log(uuid + " status: 301");
res.writeHead(301, {
"Cache-Control": "max-age=" + config.browser_cache_time + ", public",
"Response-Time": new Date() - start,
@@ -62,17 +62,17 @@ module.exports = function(req, res) {
});
res.end();
} else {
def = def || skins.default_skin(id);
def = def || skins.default_skin(uuid);
lwip.open("public/images/" + def + "_skin.png", function(err, image) {
image.toBuffer("png", function(err, buffer) {
sendimage(http_status, buffer, id);
sendimage(http_status, buffer, uuid);
});
});
}
}
function sendimage(http_status, image, id) {
logging.log(id + " status: " + http_status);
function sendimage(http_status, image, uuid) {
logging.log(uuid + " status: " + http_status);
res.writeHead(http_status, {
"Content-Type": "image/png",
"Cache-Control": "max-age=" + config.browser_cache_time + ", public",