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

fix undefined skins_dir, add http_timeout to config

Browse Source
This commit is contained in:
jomo 2014-10-29 21:23:36 +01:00
parent cc159d3620
commit a07ca210d6
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/config.js
View File

@ -2,7 +2,9 @@ var config = {
min_size: 0, // < 0 will (obviously) cause crash min_size: 0, // < 0 will (obviously) cause crash
max_size: 512, // too big values might lead to slow response time or DoS max_size: 512, // too big values might lead to slow response time or DoS
default_size: 180, // size to be used when no size given default_size: 180, // size to be used when no size given
browser_cache_time: 3600 // seconds until browser will request image again browser_cache_time: 3600,// seconds until browser will request image again
http_timeout: 1000, // ms until connection to mojang is dropped
skins_dir: 'skins/' // directory where skins are kept. should have trailing '/'
}; };
module.exports = config; module.exports = config;

3
modules/helpers.js
View File

@ -4,7 +4,6 @@ var skins = require('./skins');
var fs = require('fs'); var fs = require('fs');
var valid_uuid = /^[0-9a-f]{32}$/; var valid_uuid = /^[0-9a-f]{32}$/;
var skins_dir = config.skins_dir;
var exp = {}; var exp = {};
@ -42,7 +41,7 @@ exp.uuid_valid = function(uuid) {
// 2: profile requested/found, skin downloaded from mojang servers // 2: profile requested/found, skin downloaded from mojang servers
// 3: profile requested/found, but it has no skin // 3: profile requested/found, but it has no skin
exp.get_avatar = function(uuid, size, callback) { exp.get_avatar = function(uuid, size, callback) {
var filepath = skins_dir + uuid + ".png"; var filepath = config.skins_dir + uuid + ".png";
if (fs.existsSync(filepath)) { if (fs.existsSync(filepath)) {
skins.resize_img(filepath, size, function(result) { skins.resize_img(filepath, size, function(result) {
callback(null, 1, result); callback(null, 1, result);

5
modules/networking.js
View File

@ -1,4 +1,5 @@
var request = require('request'); var request = require('request');
var config = require('./config');
var skins = require('./skins'); var skins = require('./skins');
var session_url = "https://sessionserver.mojang.com/session/minecraft/profile/"; var session_url = "https://sessionserver.mojang.com/session/minecraft/profile/";
@ -8,7 +9,7 @@ var exp = {};
exp.get_profile = function(uuid, callback) { exp.get_profile = function(uuid, callback) {
request.get({ request.get({
url: session_url + uuid, url: session_url + uuid,
timeout: 1000 // ms timeout: config.http_timeout // ms
}, function (error, response, body) { }, function (error, response, body) {
if (!error && response.statusCode == 200) { if (!error && response.statusCode == 200) {
callback(null, JSON.parse(body)); callback(null, JSON.parse(body));
@ -36,7 +37,7 @@ exp.skin_file = function(url, outname, callback) {
request.get({ request.get({
url: url, url: url,
encoding: null, // encoding must be null so we get a buffer encoding: null, // encoding must be null so we get a buffer
timeout: 1000 // ms timeout: config.http_timeout // ms
}, function (error, response, body) { }, function (error, response, body) {
if (!error && response.statusCode == 200) { if (!error && response.statusCode == 200) {
skins.extract_face(body, outname, function() { skins.extract_face(body, outname, function() {