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

use new response module for skins

Browse Source
This commit is contained in:
jomo
2015-04-20 23:18:27 +02:00
parent 0b0882e63d
commit a947b02c87
4 changed files with 58 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/routes/avatars.js
View File

@@ -5,20 +5,21 @@ var skins = require("../skins");
var cache = require("../cache");
var path = require("path");
function handle_default(img_status, userId, size, def, callback) {
function handle_default(img_status, userId, size, def, err, callback) {
if (def && def !== "steve" && def !== "alex") {
callback({
status: img_status,
redirect: def
redirect: def,
err: err
});
} else {
def = def || skins.default_skin(userId);
skins.resize_img(path.join(__dirname, "..", "public", "images", def + ".png"), size, function(err, image) {
skins.resize_img(path.join(__dirname, "..", "public", "images", def + ".png"), size, function(resize_err, image) {
callback({
status: img_status,
body: image,
type: "image/png",
err: err
err: resize_err || err
});
});
}
@@ -70,11 +71,11 @@ module.exports = function(req, callback) {
hash: hash
});
} else {
handle_default(status, userId, size, def, callback);
handle_default(status, userId, size, def, err, callback);
}
});
} catch(e) {
logging.error(req.id, "error:", e.stack);
handle_default(-1, userId, size, def, callback);
handle_default(-1, userId, size, def, e, callback);
}
};

100
lib/routes/skins.js
View File

@@ -1,62 +1,49 @@
var logging = require("../logging");
var helpers = require("../helpers");
var config = require("../config");
var skins = require("../skins");
var path = require("path");
var lwip = require("lwip");
function handle_default(img_status, userId, def, err, callback) {
if (def && def !== "steve" && def !== "alex") {
callback({
status: img_status,
redirect: def,
err: err
});
} else {
def = def || skins.default_skin(userId);
lwip.open(path.join(__dirname, "..", "public", "images", def + "_skin.png"), function(lwip_err, image) {
if (image) {
image.toBuffer("png", function(buf_err, buffer) {
callback({
status: img_status,
body: buffer,
type: "image/png",
err: buf_err || lwip_err || err
});
});
} else {
callback({
status: -1,
err: lwip_err || err
});
}
});
}
}
// GET skin request
module.exports = function(req, res) {
var start = new Date();
module.exports = function(req, callback) {
var userId = (req.url.path_list[1] || "").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
callback({
status: -2,
body: "Invalid userid"
});
res.end("Invalid ID");
return;
}
@@ -66,25 +53,18 @@ module.exports = function(req, res) {
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);
callback({
body: image,
type: "image/png",
err: err
});
} else {
handle_default(rid, 200, userId);
handle_default(2, userId, def, err, callback);
}
});
} catch(e) {
logging.error(rid, "error:", e.stack);
handle_default(rid, 500, userId);
handle_default(-1, userId, def, e, callback);
}
};