pixl-server-storage 3.1.10 → 3.1.12

package/engines/Filesystem.js

@@ -376,8 +376,9 @@ module.exports = Class.create({
 		
 		// check cache first
 		if (this.cache && this.cache.has(key)) {
+			var item = this.cache.getMeta(key);
+			
 			process.nextTick( function() {
-				var item = self.cache.getMeta(key);
 				self.logDebug(9, "Cached head complete: " + key);
 				callback( null, {
 					mod: item.date,
@@ -420,9 +421,9 @@ module.exports = Class.create({
 		
 		// check cache first
 		if (this.cache && !is_binary && this.cache.has(key)) {
+			var data = this.cache.get(key);
+			
 			process.nextTick( function() {
-				var data = self.cache.get(key);
-				
 				try { data = JSON.parse( data ); }
 				catch (e) {
 					self.logError('file', "Failed to parse JSON record: " + key + ": " + e);

package/engines/S3.js

@@ -8,7 +8,7 @@ var Tools = require("pixl-tools");
 var Cache = require("pixl-cache");
 var S3 = require("@aws-sdk/client-s3");
 var { Upload } = require("@aws-sdk/lib-storage");
-var { NodeHttpHandler } = require("@aws-sdk/node-http-handler");
+var { NodeHttpHandler } = require("@smithy/node-http-handler");
 var streamToBuffer = require("fast-stream-to-buffer");
 
 module.exports = Class.create({
@@ -234,8 +234,9 @@ module.exports = Class.create({
 		
 		// check cache first
 		if (this.cache && this.cache.has(orig_key)) {
+			var item = this.cache.getMeta(orig_key);
+			
 			process.nextTick( function() {
-				var item = self.cache.getMeta(orig_key);
 				self.logDebug(9, "Cached head complete: " + orig_key);
 				callback( null, {
 					mod: item.date,
@@ -285,9 +286,9 @@ module.exports = Class.create({
 		
 		// check cache first
 		if (this.cache && !is_binary && this.cache.has(orig_key)) {
-			process.nextTick( function() {
-				var data = self.cache.get(orig_key);
-				
+			var data = this.cache.get(orig_key);
+			
+			process.nextTick( function() {	
 				try { data = JSON.parse( data ); }
 				catch (e) {
 					self.logError('file', "Failed to parse JSON record: " + orig_key + ": " + e);

package/hash.js

@@ -79,12 +79,12 @@ module.exports = Class.create({
 	_hashShareLock: function(key, wait, callback) {
 		// internal hash shared lock wrapper
 		// uses unique key prefix so won't deadlock with user locks
-		this.shareLock( '|'+key, wait, callback );
+		this.shareLock( 'C|'+key, wait, callback );
 	},
 	
 	_hashShareUnlock: function(key) {
 		// internal hash shared unlock wrapper
-		this.shareUnlock( '|'+key );
+		this.shareUnlock( 'C|'+key );
 	},
 	
 	hashPut: function(path, hkey, hvalue, create_opts, callback) {

package/list.js

@@ -111,12 +111,12 @@ module.exports = Class.create({
 	_listShareLock: function(key, wait, callback) {
 		// internal list shared lock wrapper
 		// uses unique key prefix so won't deadlock with user locks
-		this.shareLock( '|'+key, wait, callback );
+		this.shareLock( 'C|'+key, wait, callback );
 	},
 	
 	_listShareUnlock: function(key) {
 		// internal list shared unlock wrapper
-		this.shareUnlock( '|'+key );
+		this.shareUnlock( 'C|'+key );
 	},
 	
 	listPush: function(key, items, create_opts, callback) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pixl-server-storage",
-	"version": "3.1.10",
+	"version": "3.1.12",
 	"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",
@@ -24,7 +24,7 @@
 	"dependencies": {
 		"@aws-sdk/client-s3": "3.374.0",
 		"@aws-sdk/lib-storage": "3.374.0",
-		"@aws-sdk/node-http-handler": "3.374.0",
+		"@smithy/node-http-handler": "2.0.1",
 		"async": "2.6.4",
 		"fast-stream-to-buffer": "1.0.0",
 		"he": "1.1.1",

package/test/config.json

@@ -26,17 +26,16 @@
 			}
 		},
 		"AWS": {
-			"accessKeyId": "YOUR_AMAZON_ACCESS_KEY", 
-			"secretAccessKey": "YOUR_AMAZON_SECRET_KEY", 
 			"region": "us-west-1",
-			"correctClockSkew": true,
-			"maxRetries": 5,
-			"httpOptions": {
-				"connectTimeout": 5000,
-				"timeout": 5000
+			"credentials": {
+				"accessKeyId": "YOUR_AMAZON_ACCESS_KEY", 
+				"secretAccessKey": "YOUR_AMAZON_SECRET_KEY"
 			}
 		},
 		"S3": {
+			"connectTimeout": 5000,
+			"socketTimeout": 5000,
+			"maxAttempts": 50,
 			"keyPrefix": "",
 			"fileExtensions": true,
 			"params": {

package/transaction.js

@@ -735,10 +735,13 @@ module.exports = Class.create({
 					} );
 				},
 				function(callback) {
+					// notify listeners that the commit is starting, and the rollback log is available
+					self.emit('commitStart', trans);
+					
 					// We must fsync the directory as well, as per: http://man7.org/linux/man-pages/man2/fsync.2.html
 					// Note: Yes, read-only is the only way: https://www.reddit.com/r/node/comments/4r8k11/how_to_call_fsync_on_a_directory/
 					fs.open( Path.dirname(trans.log), "r", function(err, dh) {
-						if (err) return callback(err);
+						if (err) return callback(); // this may fail on certain OSes, so treat as non-fatal
 						
 						fs.fsync(dh, function(err) {
 							// ignoring error here, as some filesystems may not allow this
@@ -784,6 +787,7 @@ module.exports = Class.create({
 				if (err) {
 					var msg = "Failed to commit transaction: " + path + ": " + err.message;
 					self.logError('commit', msg, { id: trans.id });
+					self.emit('commitEnd', trans, err);
 					return callback( new Error(msg) );
 				}
 				
@@ -819,6 +823,7 @@ module.exports = Class.create({
 					delete trans.keys; // release memory
 				}
 				
+				self.emit('commitEnd', trans);
 				self.unlock( 'C|'+path );
 				self._transUnlock(path);
 				callback();