pixl-server-storage 3.0.20 → 3.0.23

package/README.md

@@ -523,10 +523,12 @@ Note that binary records are **not** cached, as they are generally large.  Only
 
 ## Couchbase
 
-If you want to use [Couchbase](http://www.couchbase.com/nosql-databases/couchbase-server) as a backing store, here is how to do so.  First, you need to manually install the [couchbase](https://www.npmjs.com/package/couchbase) module into your app:
+Please note that as of this writing (April 2022), pixl-server-storage only supports Couchbase Client v2, so you need to force install version `2.6.12` (see instructions below).  Work is underway to support the v3 API, which has many breaking changes.
+
+If you want to use [Couchbase](http://www.couchbase.com/nosql-databases/couchbase-server) as a backing store, here is how to do so.  First, you need to manually install the [couchbase](https://www.npmjs.com/package/couchbase) module into your app, and it **must be v2**:
 
 ```
-npm install --save couchbase
+npm install --save couchbase@2.6.12
 ```
 
 Then configure your storage thusly:

package/engines/S3.js

@@ -275,7 +275,7 @@ module.exports = Class.create({
 			if (done) return; else done = true;
 			
 			if (err) {
-				if (err.code == 'NoSuchKey') {
+				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 fetch key: " + key + ": Not found");
@@ -346,9 +346,17 @@ module.exports = Class.create({
 			if (done) return; else done = true;
 			
 			if (err) {
-				if ((err.code != 'NoSuchKey') && (err.code != 'NotFound')) {
-					self.logError('s3', "Failed to head key: " + key + ": " + (err.message || err), err);
+				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 fetch key: " + key + ": Not found");
+					err.code = "NoSuchKey";
+				}
+				else {
+					// some other error
+					self.logError('s3', "Failed to fetch key: " + key + ": " + (err.message || err), err);
 				}
+				
 				download.destroy();
 				callback( err, null );
 				return;
@@ -397,9 +405,17 @@ module.exports = Class.create({
 			if (done) return; else done = true;
 			
 			if (err) {
-				if ((err.code != 'NoSuchKey') && (err.code != 'NotFound')) {
-					self.logError('s3', "Failed to head key: " + key + ": " + (err.message || err), err);
+				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 fetch key: " + key + ": Not found");
+					err.code = "NoSuchKey";
 				}
+				else {
+					// some other error
+					self.logError('s3', "Failed to fetch key: " + key + ": " + (err.message || err), err);
+				}
+				
 				download.destroy();
 				callback( err, null );
 				return;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pixl-server-storage",
-	"version": "3.0.20",
+	"version": "3.0.23",
 	"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",
@@ -26,7 +26,7 @@
 		"pixl-tools": "^1.0.24",
 		"pixl-perf": "^1.0.0",
 		"pixl-cache": "^1.0.1",
-		"async": "2.6.0",
+		"async": "2.6.4",
 		"nearley": "2.20.1",
 		"moo": "0.4.3",
 		"porter-stemmer": "0.9.1",

package/storage.js

@@ -893,6 +893,7 @@ module.exports = Class.create({
 				},
 				function() {
 					// all locks released
+					self.logDebug(9, "All locks released.");
 					callback();
 				}
 			); // whilst

package/test/test-hash.js

@@ -10,7 +10,7 @@ var async = require('async');
 var Tools = require('pixl-tools');
 
 // const BAD_KEYS = Object.getOwnPropertyNames( Object.prototype );
-const BAD_KEYS = ['constructor', '__defineGetter__', '__defineSetter__', 'hasOwnProperty', '__lookupGetter__', '__lookupSetter__', 'isPrototypeOf', 'propertyIsEnumerable', 'toString', 'valueOf', '__proto__', 'toLocaleString'];
+const BAD_KEYS = ['constructor', '__defineGetter__', '__defineSetter__', 'hasOwnProperty', '__lookupGetter__', '__lookupSetter__', 'isPrototypeOf', 'propertyIsEnumerable', 'toString', 'valueOf', 'toLocaleString'];
 
 module.exports = {
 	tests: [

package/transaction.js

@@ -638,14 +638,17 @@ module.exports = Class.create({
 					}
 					
 					// complete, unlock and remove transaction from memory
-					self.unlock( 'C|'+path );
-					self._transUnlock(path);
 					self.transactions[path].keys = {}; // release memory
 					self.transactions[path].values = {}; // release memory
 					self.transactions[path].queue = []; // release memory
 					delete self.transactions[path];
 					
 					self.logDebug(3, "Transaction rollback complete: " + trans.id, { path: path });
+					
+					// unlock at the VERY end, as a new transaction may be waiting on the same path
+					self.unlock( 'C|'+path );
+					self._transUnlock(path);
+					
 					callback();
 				}); // fs.unlink
 			} // done with log