agoge-pouchdb-plugins - npm Package Compare versions

Comparing version 1.0.23 to 1.0.24

agoge-pouchdb-plugins.js

@@ -40,3 +40,3 @@ var CryptoJS = require('crypto-js');
 
-				for (key in doc) {
+				for ( var key in doc ) {
 				  emit([type, key, doc[key]]);
@@ -54,3 +54,3 @@ }
 			map: function(doc) {
-				for (key in doc) {
+				for ( var key in doc ) {
 					if ( key != 'type' && key.slice(0,1) != '_' ) {
@@ -78,3 +78,150 @@ emit(key);
 
+var ftsView = {
+	_id: "_design/fts" ,
+	views: {
+		fts: {
+			map: function(doc) {
+				try {
+					var p = doc._id.indexOf('-');
+					if ( p < 0 ) return;
+					var type = doc._id.slice(0, p);
+					var id = doc._id.slice(p+1, doc._id.length);
 
+					if ( type == 'meta' ) return;
+
+					var fx = function(o, prev) {
+						prev = prev || '';
+
+						for ( var key in o ) {
+							if ( key[0] == '_' ) continue;
+							var classe = Object.prototype.toString.call(o[key]);
+
+							if ( classe == '[object Object]' || classe == '[object Array]') {
+								fx(o[key], prev + '.' + key);
+							} else if ( o[key] ) {
+								var str = o[key].toString();
+
+								var words = str
+									.replace(/<(.|\n)*?>/ig, "")
+									.replace(/[^-a-z0-9_@#$\s]/ig, "")
+									.toLowerCase()
+									.split(' ')
+								;
+
+								for ( var i = 0; i < words.length; i++ ) {
+									var word = words[i];
+
+									var highlighting = [];
+									highlighting.push((prev ? prev + '.' : '') + key + ': ');
+
+									if ( words[i-3] ) highlighting.push(words[i-3]);
+									if ( words[i-2] ) highlighting.push(words[i-2]);
+									if ( words[i-1] ) highlighting.push(words[i-1]);
+
+									highlighting.push('<strong>' + word + '</strong>');
+
+									if ( words[i+1] ) highlighting.push(words[i+1]);
+									if ( words[i+2] ) highlighting.push(words[i+2]);
+									if ( words[i+3] ) highlighting.push(words[i+3]);
+
+									emit(word, {
+										type: doc.type
+										, id: doc.id
+										, desc: doc.desc
+										, highlighting: highlighting.join(' ')
+									});
+								}
+							}
+						}
+
+					}
+
+					fx(doc);
+				} catch(err) {
+					emit(null, err);
+				}
+			}.toString()
+		}
+	}
+};
+
+var metaMetaDoc = {
+	_id: 'meta-meta'
+	, type: 'meta'
+	, id: 'meta'
+	, description: 'Meta'
+	, lastDatabaseMaintence: new Date(0)
+}
+
+exports.maintence = async function(force = false) {
+	var mm = await this.getsert(metaMetaDoc);
+
+	if ( ! mm.lastDatabaseMaintence ) {
+		mm.lastDatabaseMaintence = new Date(0);
+		mm = await this.upget(mm);
+	}
+
+	var day = 1000 * 3600 * 24;
+	var now = new Date();
+	var last = new Date(mm.lastDatabaseMaintence)
+
+	var interval = now.getTime() - last.getTime();
+
+	if ( interval < day && force == false) {
+		console.log('DB: ' + last);
+		return;
+	} else {
+		mm.lastDatabaseMaintence = now;
+		await this.save(mm);
+	}
+
+
+
+	console.log('D A T A B A S E  M A I N T E N C E  S T A R T');
+
+	await this.upsert(identityMapReduce);
+	await this.buildViewIndex('identity');
+
+	await this.upsert(whereMapReduce);
+	await this.buildViewIndex('where');
+
+	await this.upsert(ftsView);
+	await this.buildViewIndex('fts');
+
+
+	await this.upsert(listGlobalFields);
+	await this.buildViewIndex('gfields');
+
+	await this.createMangoIndex(['type']);
+	await this.createMangoIndex(['type', 'desc']);
+
+	var gfields = await this.query('gfields', {
+		reduce: true
+		, group: true
+	});
+
+	for ( row of gfields.rows ) {
+		await this.createMangoIndex(['type', row.key]);
+	}
+
+	console.log();
+	await this.cleanDeletedTypes();
+
+	console.log('D A T A B A S E  M A I N T E N C E  D O N E');
+}
+
+
+exports.buildViewIndex = async function(name) {
+	while (true) {
+		try {
+			await this.query(name, {key: 0, limit: 1});
+			console.log(name + '  index build successfully');
+			break;
+		} catch(err) {
+			console.log('couchdb is busy right now, delaying index building of: '  + name);
+			await new Promise((resolve, reject)=>{setTimeout(resolve, 1000*60*10*Math.random())});
+		}
+	}
+}
+
 exports.cleanDeletedTypes = async function() {
@@ -89,2 +236,3 @@ console.log('cleanDeletedTypes started');
 	});
+
 	var globalTypes = gtypes.rows.map(x=>x.key);
@@ -94,3 +242,4 @@
 
-	var metas = await db.filter('meta').all();
+	var metas = await this.filter('meta').all();
+
 	var metaTypes = metas.map(x=>x.id);
@@ -131,14 +280,17 @@
 
-exports.buildMangoIndex = async function(name) {
-	var o = {type: 'meta' };
-	if ( name ) o[name] = 0;
+exports.buildMangoIndex = async function(fields) {
+	var o = {};
 
+	for ( var key in fields ) {
+		o[key] = 0;
+	}
+
 	while (true) {
 		try {
 			await this.find({selector: o});
-			console.log(name + '  index build successfully');
+			console.log(fields.join('-')+ '  index build successfully');
 			break;
 		} catch(err) {
-			console.log('couchdb is busy right now, delaying index building of: '  + name);
-			await new Promise((resolve, reject)=>{setTimeout(resolve, 1000*60*10*Math.random())});
+			console.log('couchdb is busy right now, delaying index building of: '  + fields.join('-') + ' - ' + err.message);
+			await new Promise((resolve, reject)=>{setTimeout(resolve, 1000*60*3*Math.random())});
 		}
@@ -148,22 +300,8 @@ }
 
-exports.createMangoTypeIndex = async function() {
-	var data = await db.createIndex({
+exports.createMangoIndex = async function(fields) {
+	var data = await this.createIndex({
 		index: {
-		  fields: ['type']
-		}
-		, name: 'type'
-		, ddoc: 'type'
-		, type: 'json'
-	});
-
-	this.buildMangoIndex();
-	console.log("MANGO 'type' INDEX: " + JSON.stringify(data.result));
-}
-
-exports.createMangoIndex = async function(name) {
-	var data = await db.createIndex({
-		index: {
-		  fields: ['type', name]
-			, name: 'type-' + name
-			, ddoc: 'type-' + name
+		  fields: fields
+			, name: fields.join('-')
+			, ddoc: fields.join('-')
 			, type: 'json'
@@ -173,28 +311,24 @@ }
 
-	this.buildMangoIndex(name);
+	if (data.result != "exists") {
+		console.log('bulding ' + fields.join('-') + ' index');
+		await this.buildMangoIndex(fields);
+	}
 
-	console.log("MANGO '" + name + "' INDEX: " + JSON.stringify(data.result));
+	console.log("MANGO '" + fields.join('-') + "' INDEX: " + JSON.stringify(data.result));
 }
 
-exports.init = async function() {
-	await this.upsert(listGlobalFields);
 
-	await this.createMangoTypeIndex();
-	await this.createMangoIndex('desc');
-
-	var gfields = await this.query('gfields', {
-		reduce: true
-		, group: true
+exports.fts = function(key) {
+	new Promise(async (resolve, reject) => {
+		await this.upsert(ftsView);
+		await this.buildViewIndex('fts');
+		resolve();
 	});
 
-	for ( row of gfields.rows ) {
-		await this.createMangoIndex(row.key);
-	}
-
-	console.log('db.init done');
+	return this.where('fts', {key: key.toLowerCase(), include_docs: false});
 }
 
-
 exports.identity = async function(type) {
 	await this.upsert(identityMapReduce);
+	await this.buildViewIndex('identity');
 
@@ -213,62 +347,84 @@ var ret = await this.query('identity/identity', {key: type, group: true});
 
-exports.tolist = async function(ddoc, view, options) {
+exports.where = function(ddocView, options) {
+	new Promise(async (resolve, reject) => {
+		await this.upsert(whereMapReduce);
+		await this.buildViewIndex('where');
+	});
+
 	var options = options || {};
-	var view = view || ddoc;
 
-	if ( options["include_docs"] !== false)
-		options["include_docs"] = true;
+	if ( options.include_docs !== false ) {
+		options.include_docs = true;
+	}
 
-	var queryResults = await this.query(ddoc + '/' + view, options);
+	var plugin = this;
 
-	var list = [];
+	return new function() {
+		this.take = async function(n, m) {
+			if ( n ) options.limit = n;
+			if ( m ) options.start_key = m;
 
-	for (resultRow of queryResults.rows) {
-		list.push(resultRow.doc);
-	}
+			var results = await plugin.query(ddocView, options);
 
-	return list;
-}
+			if ( results.rows.length == 0 && options.limit == 1) {
+				return;
+			} else if ( results.rows.length == 0) {
+				return [];
+			} else if ( options.limit == 1 ) {
+				var row = results.rows[0];
+				return row.doc || row.value;
+			} else if ( options.include_docs ) {
+				return results.rows.map(x=>x.doc);
+			} else if ( Object.prototype.toString.call(results.rows[0].value) == '[object Object]' ) {
+				return results.rows.map(x=>x.value);
+			} else {
+				return results.rows;
+			}
+		}
 
-exports.scalar = async function(ddoc, view, options) {
-	var options = options || {};
+		this.limit = this.take;
 
-	if ( options["include_docs"] !== false)
-		options["include_docs"] = true;
+		this.all = this.take;
 
-	options["limit"] = 1;
+		this.page = function(pageNo, pageSize) {
+			pageNo = pageNo || 1;
+			pageNo = Number(pageNo);
 
-	var ret = await this.query(ddoc + '/' + view, options);
+			pageSize = pageSize || 100;
+			pageSize = Number(pageSize);
 
-	if (ret.rows.length == 0)
-		return;
+			options.skip = pageNo > 1 ? pageSize * ( pageNo - 1 ) : 0;
+			options.limit = pageSize;
+			return this.take();
+		}
 
-	else
-
-	if (ret.rows.length == 1) {
-		var row = ret.rows[0];
-		return row.doc || row.value;
+		this.scalar = async function() {
+			options.limit = 1;
+			options.include_docs = true;
+			return this.take();
+		}
 	}
 }
 
-exports.first = async function(type, key, value, include_docs) {
-	var options = {
-		key: [],
-		include_docs: include_docs || true
-	};
+exports.filter = function(/*type, [key], [value], [options]*/) {
+	var type, key, value, options;
 
-	if (type) options.key.push(type);
-	if (key) options.key.push(key);
-	if (value) options.key.push(value);
+	for ( let i = 0; i < arguments.length; i++ ) {
+		if ( Object.prototype.toString.call(arguments[i]) == '[object Object]' ) {
+			options = arguments[i];
+		} else {
+			if ( i == 0 ) type = arguments[i];
+						else
+			if ( i == 1 ) key = arguments[i];
+						else
+			if ( i == 2 ) value = arguments[i];
+		}
+	}
 
-	await this.upsert(whereMapReduce);
+	var options = options || {};
+	options.key = [];
 
-	return await this.scalar('where', 'where', options);
-}
+	if ( options["include_docs"] !== false )
+		options["include_docs"] = true;
 
-exports.filter = function(type, key, value, include_docs) {
-	var options = {
-		key: [],
-		include_docs: include_docs || true
-	};
-
 	if (type) options.key.push(type);
@@ -278,82 +434,68 @@ if (key) options.key.push(key);
 
-	var plugin = this;
+	return this.where('where', options);
+}
 
-	return new function() {
-		this.take = async function(n, m) {
-			await plugin.upsert(whereMapReduce);
 
-			if ( n ) {
-				options.limit = n;
-			}
+exports.upget = async function(doc) {
+	try { existing = await this.get(doc._id); } catch(err) { var existing; }
+	var existingHash = CryptoJS.MD5(JSON.stringify(existing)).toString();
 
-			if ( m ) {
-				options.start_key = m;
-			}
+	var docHash = CryptoJS.MD5(JSON.stringify(doc)).toString();
 
-			return await plugin.tolist('where', 'where', options);
-		}
+	if ( docHash == existingHash ) {
+		return existing;
+	} else if ( existing ) {
+		doc._rev = existing._rev;
 
-		this.all = this.take;
-
-		this.page = async function(pageNo, pageSize) {
-			pageNo = pageNo || 1;
-			pageSize = pageSize || 100;
-
-			await plugin.upsert(whereMapReduce);
-
-			if ( pageNo > 1 ) {
-				options.skip = pageSize * ( pageNo - 1 );
-			}
-
-			options.limit = pageSize;
-
-			return await plugin.tolist('where', 'where', options);
-		}
+		await this.save(doc);
+		return await this.get(doc._id);
+	} else {
+		await this.save(doc);
+		return await this.get(doc._id);
 	}
 }
 
-
 exports.upsert = async function(doc, byPassSingleton = false) {
-	module.upserted = module.upserte || [];
-
 	if ( ! byPassSingleton )  {
+		module.upserted = module.upserted || [];
 		var docHash = CryptoJS.MD5(JSON.stringify(doc)).toString();
-
-		if (module.upserted.includes(docHash))
-			return doc;
-
+		if (module.upserted.includes(docHash)) return doc;
 		module.upserted.push(docHash);
 	}
 
-	try {
-		delete doc._rev;
+	try { var existing = await this.get(doc._id); } catch(err) { var existing; }
 
-		var existing = await this.get(doc._id);
+	if ( existing ) {
 		var rev = existing._rev;
+		delete doc._rev;
 		delete existing._rev;
 
-		if (JSON.stringify(doc) != JSON.stringify(existing)) {
-			doc._rev = rev;
+		var docHash = CryptoJS.MD5(JSON.stringify(doc)).toString();
+		var existingHash = CryptoJS.MD5(JSON.stringify(existing)).toString();
 
-			try {
-				return await this.put(doc);
-			} catch(err) {
-				return err;
-			}
-		} else {
-			return doc;
+		if ( docHash != existingHash ) {
+			doc._rev = rev;			
+			await this.put(doc);
 		}
 
+		return await this.get(doc._id);
+	} else {
+		delete doc._rev;
+		await this.put(doc);
+		return await this.get(doc._id);
+	}
+}
+
+exports.getsert = async function(doc) {
+	try {
+		return await this.get(doc._id);
 	} catch(err) {
-		try {
-			delete doc._rev;
+		delete doc._rev;
 
-			return await this.put(doc)
-		} catch(err) {
-			console.log(err);
-			return err;
-		}
+		await this.save(doc);
+		return await this.get(doc._id);
 	}
 }
 
+
 exports.save = async function(doc) {
@@ -399,21 +541,23 @@ var doc = await this.standardizeDoc(doc);
 
-	try {
-		var meta = await this.get('meta-' + doc.type);
+	if ( doc.type != 'meta' ) {
+		try {
+			var meta = await this.get('meta-' + doc.type);
 
-		var descKey;
+			var descKey;
 
-		for (key in meta) {
-			if ( meta[key].type == "description" ) {
-				var descKey = key;
-				break;
+			for ( var key in meta ) {
+				if ( meta[key].type == "description" ) {
+					var descKey = key;
+					break;
+				}
 			}
-		}
 
-		if ( descKey )
-			doc.desc = doc[descKey];
-		else
-			doc.desc = doc.type.toUpperCase() + ': ' + doc.id;
+			if ( descKey )
+				doc.desc = doc[descKey];
+			else
+				doc.desc = doc.type.toUpperCase() + ': ' + doc.id;
 
-	} catch(err) {
-		doc.desc = doc.type.toLowerCase() + ': ' + doc.id;
+		} catch(err) {
+			doc.desc = doc.type.toLowerCase() + ': ' + doc.id;
+		}
 	}
@@ -439,8 +583,9 @@
 	delete o._rev;
+	delete o._deleted;
 	o.type = null;
 	o.id = null;
 
-	var ret = await this.upsert(o);
+	var ret = await this.upsert(o, true);
 	return ret;
 }
 

package.json

 {
   "name": "agoge-pouchdb-plugins",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "description": "My personal plugin functions to pouchdb-couchdb",
@@ -5,0 +5,0 @@ "main": "agoge-pouchdb-plugins.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

14865

increased by53.85%

Number of package files

12

increased by200%

Lines of code

448

increased by37%

No dependency changes