pixl-server-storage 3.2.7 → 3.2.9

package/README.md

@@ -54,6 +54,7 @@ Here is the table of contents for this current document:
 		+ [S3 Key Prefix](#s3-key-prefix)
 		+ [S3 Key Template](#s3-key-template)
 		+ [S3 Cache](#s3-cache)
+		+ [S3 Compatible Services](#s3-compatible-services)
 	* [Couchbase](#couchbase)
 	* [Redis](#redis)
 		+ [RedisCluster](#rediscluster)
@@ -518,6 +519,60 @@ It is recommended that you set the `maxItems` and `maxBytes` high enough to allo
 
 Note that binary records are **not** cached, as they are generally large.  Only JSON records are cached, as they are usually much smaller and used in [Lists](https://github.com/jhuckaby/pixl-server-storage/blob/master/docs/Lists.md), [Hashes](https://github.com/jhuckaby/pixl-server-storage/blob/master/docs/Hashes.md), [Transactions](https://github.com/jhuckaby/pixl-server-storage/blob/master/docs/Transactions.md) and the [Indexer](https://github.com/jhuckaby/pixl-server-storage/blob/master/docs/Indexer.md).
 
+### S3 Compatible Services
+
+To use an S3 compatible service such as [MinIO](https://github.com/minio/minio), you'll need to add a few extra parameters to the `AWS` section:
+
+```js
+{
+	"endpoint": "http://minio:9000",
+	"endpointPrefix": false,
+	"forcePathStyle": true,
+	"hostPrefixEnabled": false
+}
+```
+
+Replace `minio:9000` with your MinIO hostname or IP address, and port number (9000 is the default).
+
+Here is a complete example with the new parameters added:
+
+```js
+{
+	"Storage": {
+		"transactions": true,
+		"trans_auto_recover": true,
+		
+		"engine": "S3",
+		"AWS": {
+			"endpoint": "http://minio:9000",
+			"endpointPrefix": false,
+			"forcePathStyle": true,
+			"hostPrefixEnabled": false,
+			"region": "us-west-1",
+			"credentials": {
+				"accessKeyId": "YOUR_MINIO_ACCESS_KEY", 
+				"secretAccessKey": "YOUR_MINIO_SECRET_KEY"
+			}
+		},
+		"S3": {
+			"connectTimeout": 5000,
+			"socketTimeout": 5000,
+			"maxAttempts": 50,
+			"keyPrefix": "",
+			"fileExtensions": true,
+			"params": {
+				"Bucket": "YOUR_MINIO_BUCKET_ID"
+			},
+			"cache": {
+				"enabled": true,
+				"maxItems": 1000,
+				"maxBytes": 10485760
+			}
+		}
+	}
+}
+```
+
 ## Couchbase
 
 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.

package/index_types/Number.js

@@ -83,6 +83,23 @@ module.exports = Class.create({
 	
 	filterWords_number: function(value) {
 		// filter number queries
+		
+		// support simple date-to-epoch conversion here
+		if (value.match(/^(\d{4})\D+(\d{2})\D+(\d{2})$/)) {
+			var dargs = Tools.getDateArgs( value + " 00:00:00" );
+			value = '' + (dargs.epoch || 0);
+		}
+		else if (value.match(/^(today)$/)) {
+			// normalize "today" to midnight today (server timezone)
+			var midnight = Tools.normalizeTime( Tools.timeNow(true), { hour:0, min:0, sec:0 } );
+			var dargs = Tools.getDateArgs( midnight );
+			value = '' + (dargs.epoch || 0);
+		}
+		else if (value.match(/^(now)$/)) {
+			var dargs = Tools.getDateArgs( Tools.timeNow(true) );
+			value = '' + (dargs.epoch || 0);
+		}
+		
 		value = value.replace(/\.\d+$/, '').replace(/[^\d\-]+/g, '').replace(/\-/, 'N');
 		return value;
 	},

package/indexer.js

@@ -961,13 +961,13 @@ module.exports = Class.create({
 	
 	filterWords_markdown: function(value) {
 		// filter out markdown syntax and html tags, entities
-		value = value.replace(/\n\`\`\`(.+?)\`\`\`/g, ''); // fenced code
+		value = value.replace(/```[\s\S]*?```/g, ''); // fenced code
 		return this.filterWords_html(value);
 	},
 	
 	filterWords_html: function(value) {
 		// filter out html tags, entities
-		return he.decode( value.replace(/<.+?>/g, '') );
+		return he.decode( value.replace(/<[^>]*>/g, '') );
 	},
 	
 	filterWords_alphanum: function(value) {
@@ -1105,6 +1105,13 @@ module.exports = Class.create({
 							// range between two values (inclusive)
 							var low = RegExp.$1;
 							var high = RegExp.$2;
+							
+							var lwords = this.getWordList(low, def, config);
+							if (lwords.length) low = lwords[0];
+							
+							var hwords = this.getWordList(high, def, config);
+							if (hwords.length) high = hwords[0];
+							
 							crit = {
 								mode: 'and', 
 								criteria: [

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pixl-server-storage",
-	"version": "3.2.7",
+	"version": "3.2.9",
 	"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",