pixl-server-storage 3.1.15 → 3.1.17

package/engines/S3.js

@@ -33,14 +33,15 @@ module.exports = Class.create({
 		var aws_config = this.storage.config.get('AWS') || this.server.config.get('AWS');
 		var s3_config = this.config.get();
 		
-		this.logDebug(2, "Setting up Amazon S3 (" + aws_config.region + ")");
-		this.logDebug(3, "S3 Bucket ID: " + s3_config.params.Bucket);
+		this.logDebug(5, "Setting up Amazon S3 (" + aws_config.region + ")");
+		this.logDebug(6, "S3 Bucket ID: " + s3_config.params.Bucket);
 		
 		this.keyPrefix = (s3_config.keyPrefix || '').replace(/^\//, '');
 		if (this.keyPrefix && !this.keyPrefix.match(/\/$/)) this.keyPrefix += '/';
 		
 		this.keyTemplate = (s3_config.keyTemplate || '').replace(/^\//, '').replace(/\/$/, '');
 		this.fileExtensions = !!s3_config.fileExtensions;
+		this.pretty = !!s3_config.pretty;
 		
 		// optional LRU cache
 		this.cache = null;
@@ -81,6 +82,7 @@ module.exports = Class.create({
 		delete combo_config.keyPrefix;
 		delete combo_config.keyTemplate;
 		delete combo_config.fileExtensions;
+		delete combo_config.pretty;
 		delete combo_config.cache;
 		
 		this.s3Params = combo_config.params || {};
@@ -146,7 +148,7 @@ module.exports = Class.create({
 		}
 		else {
 			this.logDebug(9, "Storing S3 JSON Object: " + key, this.debugLevel(10) ? params.Body : null);
-			params.Body = JSON.stringify( params.Body );
+			params.Body = this.pretty ? JSON.stringify( params.Body, null, "\t" ) : JSON.stringify( params.Body );
 			params.ContentType = 'application/json';
 		}
 		

package/indexer.js

@@ -975,6 +975,11 @@ module.exports = Class.create({
 		return value.replace(/\W+/g, '_').replace(/_+/g, '_');
 	},
 	
+	filterWords_alphanum_array: function(value) {
+		// filter out everything except alphanum + underscore + comma, suitable for JSON arrays
+		return value.replace(/[\[\]\"\']+/g, '').replace(/[^\w\,]+/g, '_').replace(/_+/g, '_');
+	},
+	
 	getWordList: function(value, def, config) {
 		// clean and filter text down to list of alphanumeric words
 		// return array of clean words

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pixl-server-storage",
-	"version": "3.1.15",
+	"version": "3.1.17",
 	"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",
@@ -22,9 +22,9 @@
 		"sqlite"
 	],
 	"dependencies": {
-		"@aws-sdk/client-s3": "3.374.0",
-		"@aws-sdk/lib-storage": "3.374.0",
-		"@smithy/node-http-handler": "2.0.1",
+		"@aws-sdk/client-s3": "3.414.0",
+		"@aws-sdk/lib-storage": "3.414.0",
+		"@smithy/node-http-handler": "2.1.4",
 		"async": "2.6.4",
 		"fast-stream-to-buffer": "1.0.0",
 		"he": "1.1.1",

package/storage.js

@@ -56,7 +56,7 @@ module.exports = Class.create({
 	startup: function(callback) {
 		// setup storage plugin
 		var self = this;
-		this.logDebug(2, "Setting up storage system v" + this.version);
+		this.logDebug(5, "Setting up storage system v" + this.version);
 		
 		// advisory locking system (in RAM, single process only)
 		this.locks = {};