pixl-server-storage 3.0.14 → 3.0.18

package/engines/S3.js

@@ -127,7 +127,7 @@ module.exports = Class.create({
 			if (done) return; else done = true;
 			
 			if (err) {
-				self.logError('s3', "Failed to store object: " + key + ": " + err.message);
+				self.logError('s3', "Failed to store object: " + key + ": " + (err.message || err), err);
 			}
 			else self.logDebug(9, "Store complete: " + key);
 			
@@ -158,7 +158,7 @@ module.exports = Class.create({
 			if (done) return; else done = true;
 			
 			if (err) {
-				self.logError('s3', "Failed to store stream: " + key + ": " + err.message);
+				self.logError('s3', "Failed to store stream: " + key + ": " + (err.message || err), err);
 			}
 			else self.logDebug(9, "Stream store complete: " + key);
 			
@@ -193,8 +193,15 @@ module.exports = Class.create({
 			if (done) return; else done = true;
 			
 			if (err) {
-				if (err.code != 'NoSuchKey') {
-					self.logError('s3', "Failed to head key: " + key + ": " + err.message);
+				if ((err.code == 'NoSuchKey') || (err.code == 'NotFound')) {
+					// key not found, special case, don't log an error
+					// always include "Not found" in error message
+					err = new Error("Failed to head key: " + key + ": Not found");
+					err.code = "NoSuchKey";
+				}
+				else {
+					// some other error
+					self.logError('s3', "Failed to head key: " + key + ": " + (err.message || err), err);
 				}
 				callback( err, null );
 				return;
@@ -249,7 +256,7 @@ module.exports = Class.create({
 				}
 				else {
 					// some other error
-					self.logError('s3', "Failed to fetch key: " + key + ": " + err.message);
+					self.logError('s3', "Failed to fetch key: " + key + ": " + (err.message || err), err);
 				}
 				callback( err, null );
 				return;
@@ -277,7 +284,10 @@ module.exports = Class.create({
 				self.logDebug(9, "JSON fetch complete: " + key, self.debugLevel(10) ? body : null);
 			}
 			
-			callback( null, body );
+			callback( null, body, {
+				mod: Math.floor((new Date(data.LastModified)).getTime() / 1000),
+				len: data.ContentLength
+			} );
 		} );
 	},
 	
@@ -294,7 +304,7 @@ module.exports = Class.create({
 		var proceed = false;
 		
 		download.on('error', function(err) {
-			if (proceed) self.logError('s3', "Failed to download key: " + key + ": " + err.message);
+			if (proceed) self.logError('s3', "Failed to download key: " + key + ": " + (err.message || err), err);
 		});
 		download.once('end', function() {
 			self.logDebug(9, "S3 stream download complete: " + key);
@@ -309,8 +319,8 @@ module.exports = Class.create({
 			if (done) return; else done = true;
 			
 			if (err) {
-				if (err.code != 'NoSuchKey') {
-					self.logError('s3', "Failed to head key: " + key + ": " + err.message);
+				if ((err.code != 'NoSuchKey') && (err.code != 'NotFound')) {
+					self.logError('s3', "Failed to head key: " + key + ": " + (err.message || err), err);
 				}
 				download.destroy();
 				callback( err, null );
@@ -345,7 +355,7 @@ module.exports = Class.create({
 		var proceed = false;
 		
 		download.on('error', function(err) {
-			if (proceed) self.logError('s3', "Failed to download key: " + key + ": " + err.message);
+			if (proceed) self.logError('s3', "Failed to download key: " + key + ": " + (err.message || err), err);
 		});
 		download.once('end', function() {
 			self.logDebug(9, "S3 stream download complete: " + key);
@@ -360,8 +370,8 @@ module.exports = Class.create({
 			if (done) return; else done = true;
 			
 			if (err) {
-				if (err.code != 'NoSuchKey') {
-					self.logError('s3', "Failed to head key: " + key + ": " + err.message);
+				if ((err.code != 'NoSuchKey') && (err.code != 'NotFound')) {
+					self.logError('s3', "Failed to head key: " + key + ": " + (err.message || err), err);
 				}
 				download.destroy();
 				callback( err, null );
@@ -404,7 +414,7 @@ module.exports = Class.create({
 			if (done) return; else done = true;
 			
 			if (err) {
-				self.logError('s3', "Failed to delete object: " + key + ": " + err.message);
+				self.logError('s3', "Failed to delete object: " + key + ": " + (err.message || err), err);
 			}
 			else self.logDebug(9, "Delete complete: " + key);
 			

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pixl-server-storage",
-	"version": "3.0.14",
+	"version": "3.0.18",
 	"description": "A key/value/list storage component for the pixl-server framework.",
 	"author": "Joseph Huckaby <jhuckaby@gmail.com>",
 	"homepage": "https://github.com/jhuckaby/pixl-server-storage",

package/storage.js

@@ -34,7 +34,8 @@ module.exports = Class.create({
 		},
 		max_recent_events: 0,
 		cache_key_match: '',
-		expiration_updates: false
+		expiration_updates: false,
+		lower_case_keys: true
 	},
 	
 	locks: null,
@@ -130,6 +131,7 @@ module.exports = Class.create({
 		this.logEventTypes = this.config.get('log_event_types');
 		this.maxRecentEvents = this.config.get('max_recent_events');
 		this.expHash = this.config.get('expiration_updates');
+		this.lowerKeys = this.config.get('lower_case_keys');
 		
 		this.cacheKeyRegex = null;
 		if (this.config.get('cache_key_match')) {
@@ -139,7 +141,9 @@ module.exports = Class.create({
 	
 	normalizeKey: function(key) {
 		// downconvert unicode, lower-case, alphanum-dash-dot-slash only, strip leading and trailing slashes
-		return unidecode(key).toLowerCase().replace(/[^\w\-\.\/]+/g, '').replace(/\/+/g, '/').replace(/^\//, '').replace(/\/$/, '');
+		key = '' + key;
+		if (this.lowerKeys) key = key.toLowerCase();
+		return unidecode(key).replace(/[^\w\-\.\/]+/g, '').replace(/\/+/g, '/').replace(/^\//, '').replace(/\/$/, '');
 	},
 	
 	isBinaryKey: function(key) {
@@ -320,7 +324,7 @@ module.exports = Class.create({
 		// invoke engine and track perf
 		var pf = this.perf.begin('get');
 		
-		this.engine.get( key, function(err, value) {
+		this.engine.get( key, function(err, value, info) {
 			// get complete
 			var elapsed = pf.end();
 			
@@ -335,8 +339,8 @@ module.exports = Class.create({
 				elapsed_ms: elapsed
 			});
 			
-			callback(null, value);
-			if (!err) self.emit('get', key, value);
+			callback(null, value, info);
+			if (!err) self.emit('get', key, value, info);
 		} );
 	},