pixl-server-storage 4.0.3 → 4.1.1

package/engines/SQLite.js

@@ -153,6 +153,7 @@ module.exports = Class.create({
 				err.message = "Failed to store object: " + key + ": " + err;
 				self.logError('sqlite', '' + err);
 				if (callback) callback(err);
+				return;
 			}
 			
 			self.logDebug(9, "Store complete: " + key);
@@ -190,13 +191,22 @@ module.exports = Class.create({
 		if (this.cache && this.cache.has(key)) {
 			var item = this.cache.getMeta(key);
 			
-			process.nextTick( function() {
-				self.logDebug(9, "Cached head complete: " + key);
-				callback( null, {
-					mod: item.date,
-					len: item.value.length
+			if (item.value.length == 0) {
+				process.nextTick( function() {
+					var err = new Error("Failed to head key: " + key + ": Not found");
+					err.code = "NoSuchKey";
+					callback( err );
 				} );
-			} );
+			}
+			else {
+				process.nextTick( function() {
+					self.logDebug(9, "Cached head complete: " + key);
+					callback( null, {
+						mod: item.date,
+						len: item.value.length
+					} );
+				} );
+			}
 			return;
 		} // cache
 		
@@ -208,12 +218,18 @@ module.exports = Class.create({
 			catch (err) {
 				err.message = "Failed to head key: " + key + ": " + err;
 				self.logError('sqlite', '' + err);
-				callback(err);
+				return callback(err);
 			}
 			
 			if (!row) {
 				var err = new Error("Failed to head key: " + key + ": Not found");
 				err.code = "NoSuchKey";
+
+				if (self.cache && !self.storage.isBinaryKey(key)) {
+					// store 'empty' stub in cache
+					self.cache.set( key, Buffer.alloc(0), { date: 0 } );
+				}
+
 				return callback(err, null);
 			}
 			callback(null, { mod: row.modified, len: row['length(value)'] });
@@ -229,19 +245,29 @@ module.exports = Class.create({
 		
 		// check cache first
 		if (this.cache && !is_binary && this.cache.has(key)) {
-			var data = this.cache.get(key);
+			var item = this.cache.getMeta(key);
 			
-			process.nextTick( function() {
-				try { data = JSON.parse( data.toString() ); }
-				catch (e) {
-					self.logError('file', "Failed to parse JSON record: " + key + ": " + e);
-					callback( e, null );
-					return;
-				}
-				self.logDebug(9, "Cached JSON fetch complete: " + key, self.debugLevel(10) ? data : null);
-				
-				callback( null, data );
-			} );
+			if (item.value.length == 0) {
+				process.nextTick( function() {
+					var err = new Error("Failed to fetch key: " + key + ": Not found");
+					err.code = "NoSuchKey";
+					callback( err );
+				} );
+			}
+			else {
+				process.nextTick( function() {
+					var data = null;
+					try { data = JSON.parse( item.value.toString() ); }
+					catch (e) {
+						self.logError('file', "Failed to parse JSON record: " + key + ": " + e);
+						callback( e, null );
+						return;
+					}
+					self.logDebug(9, "Cached JSON fetch complete: " + key, self.debugLevel(10) ? data : null);
+
+					callback( null, data );
+				} );
+			}
 			return;
 		} // cache
 		
@@ -256,11 +282,18 @@ module.exports = Class.create({
 				err.message = "Failed to fetch key: " + key + ": " + err;
 				self.logError('sqlite', '' + err);
 				callback(err);
+				return;
 			}
 			
 			if (!row) {
 				var err = new Error("Failed to fetch key: " + key + ": Not found");
 				err.code = "NoSuchKey";
+
+				if (self.cache && !is_binary) {
+					// store 'empty' stub in cache
+					self.cache.set( key, Buffer.alloc(0), { date: 0 } );
+				}
+
 				return callback(err, null);
 			}
 			if (is_binary) {
@@ -297,6 +330,7 @@ module.exports = Class.create({
 				err.message = "Failed to fetch key: " + key + ": " + err;
 				self.logError('sqlite', '' + err);
 				callback(err);
+				return;
 			}
 			
 			if (!row) {
@@ -365,7 +399,6 @@ module.exports = Class.create({
 				end = buf.length ? buf.length - 1 : 0;
 			}
 			if (isNaN(start) || isNaN(end) || (start < 0) || (start >= buf.length) || (end < start) || (end >= buf.length)) {
-				download.destroy();
 				callback( new Error("Invalid byte range (" + start + '-' + end + ") for key: " + key + " (len: " + buf.length + ")"), null );
 				return;
 			}
@@ -391,16 +424,26 @@ module.exports = Class.create({
 			catch (err) {
 				self.logError('sqlite', "Failed to delete object: " + key + ": " + err);
 				callback(err);
+				return;
 			}
 			
 			if (!info.changes) {
 				var err = new Error("Failed to delete object: " + key + ": Not found");
 				err.code = "NoSuchKey";
+
+				if (self.cache && !self.storage.isBinaryKey(key)) {
+					// store 'empty' stub in cache
+					self.cache.set( key, Buffer.alloc(0), { date: 0 } );
+				}
+
 				return callback(err);
 			}
 			self.logDebug(9, "Delete complete: " + key);
-			if (self.cache && self.cache.has(key)) {
-				self.cache.delete(key);
+
+			// possibly "delete" from LRU cache as well
+			if (self.cache && !self.storage.isBinaryKey(key)) {
+				// store 'empty' stub in cache
+				self.cache.set( key, Buffer.alloc(0), { date: 0 } );
 			}
 			callback();
 		});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pixl-server-storage",
-	"version": "4.0.3",
+	"version": "4.1.1",
 	"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/test/config.json

@@ -84,6 +84,25 @@
 				"compress": true,
 				"keep": 7
 			}
+		},
+		"Postgres": {
+			"min": 0,
+			"max": 32,
+			"host": "localhost",
+			"database": "postgres",
+			"user": "postgres",
+			"password": "postgres",
+			"port": 5432,
+			"statement_timeout": 5000,
+			"query_timeout": 6000,
+			"connectionTimeoutMillis": 30000,
+			"idleTimeoutMillis": 10000,
+			"table": "items",
+			"cache": {
+				"enabled": true,
+				"maxItems": 100000,
+				"maxBytes": 104857600
+			}
 		}
 	}
 }