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

prepend request IDs instead of UUIDs, fixes #77

Browse Source 
also cleaned up a few other things I noticed when looking over the files
This commit is contained in:
jomo
2015-01-31 17:10:49 +01:00
parent a2fc680b11
commit e6152d5898
11 changed files with 214 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/cache.js
View File

@@ -37,7 +37,7 @@ function connect_redis() {
// sets the date of the face file belonging to +hash+ to now
// the helms file is ignored because we only need 1 file to read/write from
function update_file_date(hash, uuid) {
function update_file_date(rid, hash) {
if (hash) {
var path = config.faces_dir + hash + ".png";
fs.exists(path, function(exists) {
@@ -45,11 +45,11 @@ function update_file_date(hash, uuid) {
var date = new Date();
fs.utimes(path, date, date, function(err){
if (err) {
logging.error(uuid + " Error: " + err);
logging.error(rid + "Error: " + err.stack);
}
});
} else {
logging.error(uuid + " tried to update " + path + " date, but it does not exist");
logging.error(rid + "tried to update " + path + " date, but it does not exist");
}
});
}
@@ -93,19 +93,19 @@ exp.info = function(callback) {
};
// sets the timestamp for +uuid+ and its face file's date to now
exp.update_timestamp = function(uuid, hash) {
logging.log(uuid + " cache: updating timestamp");
exp.update_timestamp = function(rid, uuid, hash) {
logging.log(rid + "cache: updating timestamp");
var time = new Date().getTime();
// store uuid in lower case if not null
uuid = uuid && uuid.toLowerCase();
redis.hmset(uuid, "t", time);
update_file_date(hash, uuid);
update_file_date(rid, hash);
};
// create the key +uuid+, store +hash+ and time
exp.save_hash = function(uuid, skin, cape) {
logging.log(uuid + " cache: saving hash");
logging.log("skin:" + skin + " cape:" + cape);
// create the key +uuid+, store +skin+ hash, +cape+ hash and time
exp.save_hash = function(rid, uuid, skin, cape) {
logging.log(rid + "cache: saving hash");
logging.log(rid + "skin:" + skin + " cape:" + cape);
var time = new Date().getTime();
// store shorter null byte instead of "null"
skin = skin || ".";
@@ -115,8 +115,8 @@ exp.save_hash = function(uuid, skin, cape) {
redis.hmset(uuid, "s", skin, "c", cape, "t", time);
};
exp.remove_hash = function(uuid) {
logging.log(uuid + " cache: deleting hash");
exp.remove_hash = function(rid, uuid) {
logging.log(rid + "cache: deleting hash");
redis.del(uuid.toLowerCase(), "h", "t");
};

128
modules/helpers.js
View File

@@ -15,35 +15,35 @@ function get_hash(url) {
return hash_pattern.exec(url)[0].toLowerCase();
}
function store_skin(uuid, profile, details, callback) {
networking.get_skin_url(uuid, profile, function(url) {
function store_skin(rid, uuid, profile, details, callback) {
networking.get_skin_url(rid, uuid, profile, function(url) {
if (url) {
var hash = get_hash(url);
if (details && details.skin === hash) {
cache.update_timestamp(uuid, hash);
cache.update_timestamp(rid, uuid, hash);
callback(null, hash);
} else {
logging.log(uuid + " new skin hash: " + hash);
logging.log(rid + "new skin hash: " + hash);
var facepath = __dirname + "/../" + config.faces_dir + hash + ".png";
var helmpath = __dirname + "/../" + config.helms_dir + hash + ".png";
fs.exists(facepath, function(exists) {
if (exists) {
logging.log(uuid + " skin already exists, not downloading");
logging.log(rid + "skin already exists, not downloading");
callback(null, hash);
} else {
networking.get_from(url, function(img, response, err) {
networking.get_from(rid, url, function(img, response, err) {
if (err || !img) {
callback(err, null);
} else {
skins.extract_face(img, facepath, function(err) {
if (err) {
logging.error(err);
logging.error(rid + err.stack);
callback(err, null);
} else {
logging.log(uuid + " face extracted");
skins.extract_helm(uuid, facepath, img, helmpath, function(err) {
logging.log(uuid + " helm extracted");
logging.debug(helmpath);
logging.log(rid + "face extracted");
skins.extract_helm(rid, facepath, img, helmpath, function(err) {
logging.log(rid + "helm extracted");
logging.debug(rid + helmpath);
callback(err, hash);
});
}
@@ -59,28 +59,28 @@ function store_skin(uuid, profile, details, callback) {
});
}
function store_cape(uuid, profile, details, callback) {
networking.get_cape_url(uuid, profile, function(url) {
function store_cape(rid, uuid, profile, details, callback) {
networking.get_cape_url(rid, uuid, profile, function(url) {
if (url) {
var hash = get_hash(url);
if (details && details.cape === hash) {
cache.update_timestamp(uuid, hash);
cache.update_timestamp(rid, uuid, hash);
callback(null, hash);
} else {
logging.log(uuid + " new cape hash: " + hash);
logging.log(rid + "new cape hash: " + hash);
var capepath = __dirname + "/../" + config.capes_dir + hash + ".png";
fs.exists(capepath, function(exists) {
if (exists) {
logging.log(uuid + " cape already exists, not downloading");
logging.log(rid + "cape already exists, not downloading");
callback(null, hash);
} else {
networking.get_from(url, function(img, response, err) {
networking.get_from(rid, url, function(img, response, err) {
if (err || !img) {
logging.error(err);
logging.error(rid + err.stack);
callback(err, null);
} else {
skins.save_image(img, capepath, function(err) {
logging.log(uuid + " cape saved");
logging.log(rid + "cape saved");
callback(err, hash);
});
}
@@ -103,7 +103,7 @@ function callback_for(uuid, type, err, hash) {
for (var i = 0; i < currently_running.length; i++) {
var current = currently_running[i];
if (current.uuid === uuid && current.type === type) {
logging.debug(uuid + " now completing queued " + type + " request");
logging.debug(current.rid + "now completing queued " + type + " request");
current.callback(err, hash);
currently_running.splice(i, 1); // remove from array
i--;
@@ -120,31 +120,32 @@ function array_has_obj(arr, property, value) {
return false;
}
function store_images(uuid, details, type, callback) {
function store_images(rid, uuid, details, type, callback) {
var is_uuid = uuid.length > 16;
var new_hash = {
rid: rid,
uuid: uuid,
type: type,
callback: callback
};
if (!array_has_obj(currently_running, "uuid", uuid)) {
currently_running.push(new_hash);
networking.get_profile((is_uuid ? uuid : null), function(err, profile) {
networking.get_profile(rid, (is_uuid ? uuid : null), function(err, profile) {
if (err || (is_uuid && !profile)) {
callback_for(uuid, type, err, null);
} else {
store_skin(uuid, profile, details, function(err, skin_hash) {
cache.save_hash(uuid, skin_hash, null);
store_skin(rid, uuid, profile, details, function(err, skin_hash) {
cache.save_hash(rid, uuid, skin_hash, null);
callback_for(uuid, "skin", err, skin_hash);
store_cape(uuid, profile, details, function(err, cape_hash) {
cache.save_hash(uuid, skin_hash, cape_hash);
store_cape(rid, uuid, profile, details, function(err, cape_hash) {
cache.save_hash(rid, uuid, skin_hash, cape_hash);
callback_for(uuid, "cape", err, cape_hash);
});
});
}
});
} else {
logging.log(uuid + " ID already being processed, adding to queue");
logging.log(rid + "ID already being processed, adding to queue");
currently_running.push(new_hash);
}
}
@@ -165,28 +166,28 @@ exp.uuid_valid = function(uuid) {
// 1: "cached" - found on disk
// 2: "downloaded" - profile downloaded, skin downloaded from mojang servers
// 3: "checked" - profile re-downloaded (was too old), but it has either not changed or has no skin
exp.get_image_hash = function(uuid, raw_type, callback) {
exp.get_image_hash = function(rid, uuid, raw_type, callback) {
cache.get_details(uuid, function(err, details) {
var type = (details !== null ? (raw_type === "skin" ? details.skin : details.cape) : null);
if (err) {
callback(err, -1, null);
} else {
if (details && details.time + config.local_cache_time * 1000 >= new Date().getTime()) {
logging.log(uuid + " uuid cached & recently updated");
logging.log(rid + "uuid cached & recently updated");
callback(null, (type ? 1 : 0), type);
} else {
if (details) {
logging.log(uuid + " uuid cached, but too old");
logging.log(rid + "uuid cached, but too old");
} else {
logging.log(uuid + " uuid not cached");
logging.log(rid + "uuid not cached");
}
store_images(uuid, details, raw_type, function(err, hash) {
store_images(rid, uuid, details, raw_type, function(err, hash) {
if (err) {
callback(err, -1, details && type);
} else {
var status = details && (type === hash) ? 3 : 2;
logging.debug(uuid + " old hash: " + (details && type));
logging.log(uuid + " hash: " + hash);
logging.debug(rid + "old hash: " + (details && type));
logging.log(rid + "hash: " + hash);
callback(null, status, hash);
}
});
@@ -200,9 +201,8 @@ exp.get_image_hash = function(uuid, raw_type, callback) {
// callback contains error, status, image buffer, hash
// image is the user's face+helm when helm is true, or the face otherwise
// for status, see get_image_hash
exp.get_avatar = function(uuid, helm, size, callback) {
logging.log("request: " + uuid);
exp.get_image_hash(uuid, "skin", function(err, status, hash) {
exp.get_avatar = function(rid, uuid, helm, size, callback) {
exp.get_image_hash(rid, uuid, "skin", function(err, status, hash) {
if (hash) {
var facepath = __dirname + "/../" + config.faces_dir + hash + ".png";
var helmpath = __dirname + "/../" + config.helms_dir + hash + ".png";
@@ -230,18 +230,18 @@ exp.get_avatar = function(uuid, helm, size, callback) {
// handles requests for +uuid+ skins
// callback contains error, hash, image buffer
exp.get_skin = function(uuid, callback) {
logging.log(uuid + " skin request");
exp.get_image_hash(uuid, "skin", function(err, status, hash) {
exp.get_skin = function(rid, uuid, callback) {
logging.log(rid + "skin request");
exp.get_image_hash(rid, uuid, "skin", function(err, status, hash) {
var skinpath = __dirname + "/../" + config.skins_dir + hash + ".png";
fs.exists(skinpath, function (exists) {
fs.exists(skinpath, function(exists) {
if (exists) {
logging.log(uuid + " skin already exists, not downloading");
logging.log(rid + "skin already exists, not downloading");
skins.open_skin(uuid, skinpath, function(err, img) {
callback(err, hash, img);
});
} else {
networking.save_texture(uuid, hash, skinpath, function(err, img) {
networking.save_texture(rid, uuid, hash, skinpath, function(err, response, img) {
callback(err, hash, img);
});
}
@@ -256,8 +256,8 @@ function get_type(helm, body) {
// handles creations of skin renders
// callback contanis error, hash, image buffer
exp.get_render = function(uuid, scale, helm, body, callback) {
exp.get_skin(uuid, function(err, hash, img) {
exp.get_render = function(rid, uuid, scale, helm, body, callback) {
exp.get_skin(rid, uuid, function(err, hash, img) {
if (!hash) {
callback(err, -1, hash, null);
return;
@@ -265,7 +265,7 @@ exp.get_render = function(uuid, scale, helm, body, callback) {
var renderpath = __dirname + "/../" + config.renders_dir + hash + "-" + scale + "-" + get_type(helm, body) + ".png";
fs.exists(renderpath, function(exists) {
if (exists) {
renders.open_render(uuid, renderpath, function(err, img) {
renders.open_render(rid, renderpath, function(err, img) {
callback(err, 1, hash, img);
});
return;
@@ -274,7 +274,7 @@ exp.get_render = function(uuid, scale, helm, body, callback) {
callback(err, 0, hash, null);
return;
}
renders.draw_model(uuid, img, scale, helm, body, function(err, img) {
renders.draw_model(rid, img, scale, helm, body, function(err, img) {
if (err) {
callback(err, -1, hash, null);
} else if (!img) {
@@ -282,7 +282,7 @@ exp.get_render = function(uuid, scale, helm, body, callback) {
} else {
fs.writeFile(renderpath, img, "binary", function(err) {
if (err) {
logging.log(err);
logging.log(rid + err.stack);
}
callback(null, 2, hash, img);
});
@@ -293,33 +293,11 @@ exp.get_render = function(uuid, scale, helm, body, callback) {
});
};
// handles requests for +uuid+ skins
// callback contains error, hash, image buffer
exp.get_skin = function(uuid, callback) {
logging.log(uuid + " skin request");
exp.get_image_hash(uuid, "skin", function(err, status, hash) {
var skinpath = __dirname + "/../" + config.skins_dir + hash + ".png";
fs.exists(skinpath, function(exists) {
if (exists) {
logging.log("skin already exists, not downloading");
skins.open_skin(uuid, skinpath, function(err, img) {
callback(err, hash, img);
});
} else {
networking.save_texture(uuid, hash, skinpath, function(err, response, img) {
callback(err, hash, img);
});
}
});
});
};
// handles requests for +uuid+ capes
// callback contains error, hash, image buffer
exp.get_cape = function(uuid, callback) {
logging.log(uuid + " cape request");
exp.get_image_hash(uuid, "cape", function(err, status, hash) {
exp.get_cape = function(rid, uuid, callback) {
logging.log(rid + "cape request");
exp.get_image_hash(rid, uuid, "cape", function(err, status, hash) {
if (!hash) {
callback(err, null, null);
return;
@@ -327,12 +305,12 @@ exp.get_cape = function(uuid, callback) {
var capepath = __dirname + "/../" + config.capes_path + hash + ".png";
fs.exists(capepath, function(exists) {
if (exists) {
logging.log("cape already exists, not downloading");
logging.log(rid + "cape already exists, not downloading");
skins.open_skin(uuid, capepath, function(err, img) {
callback(err, hash, img);
});
} else {
networking.save_texture(uuid, hash, capepath, function(err, response, img) {
networking.save_texture(rid, uuid, hash, capepath, function(err, response, img) {
if (response && response.statusCode === 404) {
callback(err, hash, null);
} else {

64
modules/networking.js
View File

@@ -21,7 +21,7 @@ function extract_url(profile, property) {
});
}
return url;
};
}
// exracts the skin url of a +profile+ object
// returns null when no url found (user has no skin)
@@ -40,7 +40,7 @@ exp.extract_cape_url = function(profile) {
// encoding and timeouts, defaults are already
// specified. +callback+ contains the body, response,
// and error buffer. get_from helper method is available
exp.get_from_options = function(url, options, callback) {
exp.get_from_options = function(rid, url, options, callback) {
request.get({
url: url,
headers: {
@@ -54,29 +54,29 @@ exp.get_from_options = function(url, options, callback) {
// 200 or 301 depending on content type
if (!error && (response.statusCode === 200 || response.statusCode === 301)) {
// response received successfully
logging.log(url + " url received");
logging.log(rid + url + " url received");
callback(body, response, null);
} else if (error) {
callback(body || null, response, error);
} else if (response.statusCode === 404) {
// page does not exist
logging.log(url + " url does not exist");
logging.log(rid + url + " url does not exist");
callback(null, response, null);
} else if (response.statusCode === 429) {
// Too Many Requests exception - code 429
logging.warn(body || "Too many requests");
logging.warn(rid + body || "Too many requests");
callback(body || null, response, error);
} else {
logging.error(url + " Unknown error:");
//logging.error(response);
logging.error(rid + url + " Unknown error:");
logging.error(rid + response);
callback(body || null, response, error);
}
});
};
// helper method for get_from_options, no options required
exp.get_from = function(url, callback) {
exp.get_from_options(url, {}, function(body, response, err) {
exp.get_from = function(rid, url, callback) {
exp.get_from_options(rid, url, {}, function(body, response, err) {
callback(body, response, err);
});
};
@@ -90,8 +90,8 @@ var mojang_url_types = {
// make a request to skins.miencraft.net
// the skin url is taken from the HTTP redirect
// type reference is above
exp.get_username_url = function(name, type, callback) {
exp.get_from(mojang_url_types[type] + name + ".png", function(body, response, err) {
exp.get_username_url = function(rid, name, type, callback) {
exp.get_from(rid, mojang_url_types[type] + name + ".png", function(body, response, err) {
if (!err) {
callback(err, response ? (response.statusCode === 404 ? null : response.headers.location) : null);
} else {
@@ -114,21 +114,21 @@ exp.get_uuid_url = function(profile, type, callback) {
// make a request to sessionserver
// profile is returned as json
exp.get_profile = function(uuid, callback) {
exp.get_profile = function(rid, uuid, callback) {
if (!uuid) {
callback(null, null);
} else {
exp.get_from_options(session_url + uuid, { encoding: "utf8" }, function(body, response, err) {
exp.get_from_options(rid, session_url + uuid, { encoding: "utf8" }, function(body, response, err) {
callback(err || null, (body !== null ? JSON.parse(body) : null));
});
});
}
};
// +uuid+ is likely a username and if so
// +uuid+ is used to get the url, otherwise
// +profile+ will be used to get the url
exp.get_skin_url = function(uuid, profile, callback) {
getUrl(uuid, profile, 1, function(url) {
exp.get_skin_url = function(rid, uuid, profile, callback) {
getUrl(rid, uuid, profile, 1, function(url) {
callback(url);
});
};
@@ -136,16 +136,16 @@ exp.get_skin_url = function(uuid, profile, callback) {
// +uuid+ is likely a username and if so
// +uuid+ is used to get the url, otherwise
// +profile+ will be used to get the url
exp.get_cape_url = function(uuid, profile, callback) {
getUrl(uuid, profile, 2, function(url) {
exp.get_cape_url = function(rid, uuid, profile, callback) {
getUrl(rid, uuid, profile, 2, function(url) {
callback(url);
});
};
function getUrl(uuid, profile, type, callback) {
function getUrl(rid, uuid, profile, type, callback) {
if (uuid.length <= 16) {
//username
exp.get_username_url(uuid, type, function(err, url) {
exp.get_username_url(rid, uuid, type, function(err, url) {
callback(url || null);
});
} else {
@@ -155,25 +155,17 @@ function getUrl(uuid, profile, type, callback) {
}
}
// downloads skin file from +url+
// callback contains error, image
exp.get_skin = function(url, uuid, callback) {
exp.get_from(url, function(body, response, err) {
callback(body, err);
});
};
exp.save_texture = function(uuid, hash, outpath, callback) {
exp.save_texture = function(rid, uuid, hash, outpath, callback) {
if (hash) {
var textureurl = "http://textures.minecraft.net/texture/" + hash;
exp.get_from(textureurl, function(img, response, err) {
exp.get_from(rid, textureurl, function(img, response, err) {
if (err) {
logging.error(uuid + "error while downloading texture");
logging.error(rid + "error while downloading texture");
callback(err, response, null);
} else {
fs.writeFile(outpath, img, "binary", function(err) {
if (err) {
logging.log(uuid + " error: " + err);
logging.log(rid + "error: " + err.stack);
}
callback(err, response, img);
});
@@ -184,10 +176,4 @@ exp.save_texture = function(uuid, hash, outpath, callback) {
}
};
exp.get_cape = function(url, callback) {
exp.get_from(url, function(body, response, err) {
callback(err, body);
});
};
module.exports = exp;
module.exports = exp;

26
modules/renders.js
View File

@@ -42,9 +42,9 @@ exp.draw_head = function(skin_canvas, model_ctx, scale) {
// draws the body on to the +skin_canvas+
// using the skin from the +model_ctx+ at the +scale+
// parts are labeled as if drawn from the skin's POV
exp.draw_body = function(uuid, skin_canvas, model_ctx, scale) {
exp.draw_body = function(rid, skin_canvas, model_ctx, scale) {
if (skin_canvas.height == 32 * scale) {
logging.log(uuid + " old skin");
logging.debug(rid + "uses old skin format");
//Left Leg
//Left Leg - Front
model_ctx.setTransform(1,-0.5,0,1.2,0,0);
@@ -85,7 +85,7 @@ exp.draw_body = function(uuid, skin_canvas, model_ctx, scale) {
model_ctx.scale(-1,1);
model_ctx.drawImage(skin_canvas, 44*scale, 16*scale, 4*scale, 4*scale, -16*scale, 16*scale, 4*scale, 4*scale);
} else {
logging.log(uuid + " new skin");
logging.debug(rid + "uses new skin format");
//Left Leg
//Left Leg - Front
model_ctx.setTransform(1,-0.5,0,1.2,0,0);
@@ -127,14 +127,14 @@ exp.draw_body = function(uuid, skin_canvas, model_ctx, scale) {
};
// sets up the necessary components to draw the skin model
// uses the +img+ skin from the +uuid+ with options of drawing
// uses the +img+ skin with options of drawing
// the +helm+ and the +body+
// callback contains error, image buffer
exp.draw_model = function(uuid, img, scale, helm, body, callback) {
exp.draw_model = function(rid, img, scale, helm, body, callback) {
var image = new Image();
image.onerror = function(err) {
logging.error(uuid + " render error: " + err);
logging.error(rid + "render error: " + err.stack);
callback(err, null);
};
@@ -151,19 +151,19 @@ exp.draw_model = function(uuid, img, scale, helm, body, callback) {
//Scale it
scale_image(skin_ctx.getImageData(0,0,64,original_height), skin_ctx, 0, 0, scale);
if (body) {
logging.log(uuid + " drawing body");
exp.draw_body(uuid, skin_canvas, model_ctx, scale);
logging.log(rid + "drawing body");
exp.draw_body(rid, skin_canvas, model_ctx, scale);
}
logging.log(uuid + " drawing head");
logging.log(rid + "drawing head");
exp.draw_head(skin_canvas, model_ctx, scale);
if (helm) {
logging.log(uuid + " drawing helmet");
logging.log(rid + "drawing helmet");
exp.draw_helmet(skin_canvas, model_ctx, scale);
}
model_canvas.toBuffer(function(err, buf){
if (err) {
logging.log(uuid + " error creating buffer: " + err);
logging.log(rid + "error creating buffer: " + err);
}
callback(err, buf);
});
@@ -174,10 +174,10 @@ exp.draw_model = function(uuid, img, scale, helm, body, callback) {
// helper method to open a render from +renderpath+
// callback contains error, image buffer
exp.open_render = function(uuid, renderpath, callback) {
exp.open_render = function(rid, renderpath, callback) {
fs.readFile(renderpath, function (err, buf) {
if (err) {
logging.error(uuid + " error while opening skin file: " + err);
logging.error(rid + "error while opening skin file: " + err);
}
callback(err, buf);
});

14
modules/skins.js
View File

@@ -29,7 +29,7 @@ exp.extract_face = function(buffer, outname, callback) {
// +facefile+ is the filename of an image produced by extract_face
// result is saved to a file called +outname+
// +callback+ contains error
exp.extract_helm = function(uuid, facefile, buffer, outname, callback) {
exp.extract_helm = function(rid, facefile, buffer, outname, callback) {
lwip.open(buffer, "png", function(err, skin_img) {
if (err) {
callback(err);
@@ -53,7 +53,7 @@ exp.extract_helm = function(uuid, facefile, buffer, outname, callback) {
callback(err);
});
} else {
logging.log(uuid + " helm image is the same as face image, not storing!");
logging.log(rid + "helm image is the same as face image, not storing!");
callback(null);
}
});
@@ -62,10 +62,10 @@ exp.extract_helm = function(uuid, facefile, buffer, outname, callback) {
}
});
});
}
});
}
});
}
});
}
});
};
// resizes the image file +inname+ to +size+ by +size+ pixels
@@ -98,7 +98,7 @@ exp.default_skin = function(uuid) {
exp.open_skin = function(uuid, skinpath, callback) {
fs.readFile(skinpath, function(err, buf) {
if (err) {
logging.error(uuid + " error while opening skin file: " + err);
logging.error(rid + "error while opening skin file: " + err);
callback(err, null)
} else {
callback(null, buf);