@cocreate/crud-server 1.10.0 → 1.11.0

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+# [1.11.0](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.10.1...v1.11.0) (2022-10-01)
+
+
+### Bug Fixes
+
+* broadcast params reduced to socket, message, data ([ec9c8f2](https://github.com/CoCreate-app/CoCreate-crud-server/commit/ec9c8f259e516424ef95433904a0e89d2aa0c727))
+* bump dependencies ([b5b9350](https://github.com/CoCreate-app/CoCreate-crud-server/commit/b5b9350dbcb1b20fc945542a600d526ddb78fb91))
+* createDocument inserts  _id in the data object ([113c2ff](https://github.com/CoCreate-app/CoCreate-crud-server/commit/113c2ffb3d0a291f3af8ba645f709b1b5811089d))
+* createQuery ObjectId ([ec79e40](https://github.com/CoCreate-app/CoCreate-crud-server/commit/ec79e40b81760e347ce5d8d70ed28f3494c49538))
+* filter value can be an object or an array ([75cd195](https://github.com/CoCreate-app/CoCreate-crud-server/commit/75cd19560d8086f01a05f55e76102793789ec1d1))
+* merged crud and list ([acff218](https://github.com/CoCreate-app/CoCreate-crud-server/commit/acff21831b2ca1274bc5af775f7d3758f2e55663))
+* relocate and import filter.js from @cocreate/filter ([b8bab38](https://github.com/CoCreate-app/CoCreate-crud-server/commit/b8bab3882b5ece91115a4568aa80bc5eca2c80f3))
+
+
+### Features
+
+* config now accessible from socket.config ([2d892ff](https://github.com/CoCreate-app/CoCreate-crud-server/commit/2d892ff961cb48187f8253a4f3778719cb764d1c))
+* if data.returnDocument = false only defined names are returned ([652f624](https://github.com/CoCreate-app/CoCreate-crud-server/commit/652f6242c947d3b46d01deaea784f964f43450fd))
+
+## [1.10.1](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.10.0...v1.10.1) (2022-09-01)
+
+
+### Bug Fixes
+
+* bump dependencies ([15b088a](https://github.com/CoCreate-app/CoCreate-crud-server/commit/15b088ad50ecd57b77a442bf6f99bdae8fffdf09))
+
 # [1.10.0](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.9.2...v1.10.0) (2022-08-31)
 
 

package/docs/index.html

@@ -121,7 +121,7 @@
             </div>				
         </div>
         <script>
-            var config = {
+            var CoCreateConfig = {
                 apiKey: 'c2b08663-06e3-440c-ef6f-13978b42883a',
                 securityKey: 'f26baf68-e3a9-45fc-effe-502e47116265',
                 organization_id: '5de0387b12e200ea63204d6c'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/crud-server",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "CoCreate-crud-server",
   "keywords": [
     "cocreate-crud",
@@ -40,7 +40,7 @@
   },
   "homepage": "https://cocreate.app/docs/CoCreate-crud-server",
   "dependencies": {
-    "@cocreate/docs": "^1.2.70",
+    "@cocreate/docs": "^1.3.14",
     "csvtojson": "^2.0.10",
     "json-2-csv": "^3.10.3",
     "mongodb": "^4.4.0"

package/src/backup.js

@@ -13,11 +13,11 @@ class CoCreateBackup {
 	
 	init() {
 		if (this.wsManager) {
-			// this.wsManager.on('exportDB',		(socket, data, socketInfo) => this.exportData(socket, data, socketInfo));
-			// this.wsManager.on('importDB',		(socket, data, socketInfo) => this.importData(socket, data, socketInfo));
-			// this.wsManager.on('importFile2DB',	(socket, data, socketInfo) => this.importData(socket, data, socketInfo));
+			// this.wsManager.on('exportDB',		(socket, data) => this.exportData(socket, data));
+			// this.wsManager.on('importDB',		(socket, data) => this.importData(socket, data));
+			// this.wsManager.on('importFile2DB',	(socket, data) => this.importData(socket, data));
 			
-			// this.wsManager.on('downloadData',	(socket, data, socketInfo) => this.downloadData(socket, data, socketInfo))
+			// this.wsManager.on('downloadData',	(socket, data) => this.downloadData(socket, data))
 		}
 	}
 	
@@ -28,13 +28,13 @@ class CoCreateBackup {
 	 	data: JSON data
 	 }
 	**/
-	// async downloadData(socket, data, socketInfo) {
+	// async downloadData(socket, data) {
 	// 	const export_type = data.type || "json";
 		
 	// 	try {
 	// 		let binaryData = null;
 	// 		const result = data.data;
-	// 		const orgId = socketInfo ? socketInfo.orgId : "";
+	// 		const orgId = socket.config.orgId ;
 	// 		if (export_type === 'csv') {
 	// 			binaryData = await json2csv.json2csvAsync(JSON.parse(JSON.stringify(result)), {
 	// 				emptyFieldValue: ''
@@ -60,7 +60,7 @@ class CoCreateBackup {
 		
 	})
 	**/
-	// async exportData(socket, data, socketInfo) {
+	// async exportData(socket, data) {
 	// 	const self = this;
 		
 	// 	const export_type = data.export_type || "json";
@@ -68,7 +68,7 @@ class CoCreateBackup {
 	// 	try {
 			
 	// 		var collection = this.dbClient.db(data['namespace']).collection(data["collection"]);
-	// 		const orgId = socketInfo ? socketInfo.orgId : "";
+	// 		const orgId = socket.config.orgId
 			
 	// 		var query = {};
 			
@@ -92,13 +92,13 @@ class CoCreateBackup {
 	// 	}
 	// }
 	
-	// async setImportData(socket, data, socketInfo) {
+	// async setImportData(socket, data) {
 	// 	this.importCollection = data['collection']
 	// 	this.importType = data['import_type'];
 	// 	this.importDB = data['namespace'];
 	// }
 
-	// async importData(socket, data, socketInfo) {
+	// async importData(socket, data) {
 	// 	const importCollection = data['collection']
 	// 	const importType = data['import_type'];
 	// 	const importFile = data['file'];
@@ -106,7 +106,7 @@ class CoCreateBackup {
 		
 	// 	console.log('import:', importCollection, importType, importFile)
 	// 	const self = this;
-	// 	// const orgId = socketInfo ? socketInfo.orgId : "";
+	// 	//	const orgId = socket.config.orgId
 	// 	if (!importCollection || !importType) {
 	// 		return;
 	// 	}

package/src/crud.js

@@ -1,5 +1,7 @@
 const {ObjectId} = require("mongodb");
 const {replaceArray} = require("./utils.crud.js")
+const {searchData, sortData} = require("@cocreate/filter")
+
 
 
 class CoCreateCrud {
@@ -11,270 +13,411 @@ class CoCreateCrud {
 	
 	init() {
 		if (this.wsManager) {
-			this.wsManager.on('createDocument', (socket, data, socketInfo) => this.createDocument(socket, data, socketInfo));
-			this.wsManager.on('readDocument',	(socket, data, socketInfo) => this.readDocument(socket, data, socketInfo))
-			this.wsManager.on('updateDocument', (socket, data, socketInfo) => this.updateDocument(socket, data, socketInfo))
-			this.wsManager.on('deleteDocument', (socket, data, socketInfo) => this.deleteDocument(socket, data, socketInfo))
-			this.wsManager.on('createCollection', (socket, data, socketInfo) => this.createCollection(socket, data, socketInfo));
-			this.wsManager.on('updateCollection', (socket, data, socketInfo) => this.updateCollection(socket, data, socketInfo))
-			this.wsManager.on('deleteCollection', (socket, data, socketInfo) => this.deleteCollection(socket, data, socketInfo))
+			this.wsManager.on('createDocument',   (socket, data) => this.createDocument(socket, data))
+			this.wsManager.on('readDocument',     (socket, data) => this.readDocument(socket, data))
+			this.wsManager.on('updateDocument',   (socket, data) => this.updateDocument(socket, data))
+			this.wsManager.on('deleteDocument',   (socket, data) => this.deleteDocument(socket, data))
+			this.wsManager.on('readDocuments', 	  (socket, data) => this.readDocuments(socket, data))
+			this.wsManager.on('createCollection', (socket, data) => this.createCollection(socket, data))
+			this.wsManager.on('updateCollection', (socket, data) => this.updateCollection(socket, data))
+			this.wsManager.on('deleteCollection', (socket, data) => this.deleteCollection(socket, data))
+			this.wsManager.on('readCollections',  (socket, data) => this.readCollections(socket, data))
 		}
 	}
 
 	/** Create Document **/
-	async createDocument(socket, req_data, socketInfo){
+	async createDocument(socket, data){
 		const self = this;
-		if(!req_data.data) return;
+		if(!data.data) return;
 
 		try{
-			const db = this.dbClient.db(req_data['organization_id']);
-			const collection = db.collection(req_data["collection"]);
-			let insertData = replaceArray(req_data.data);
-			insertData['organization_id'] = req_data['organization_id'];
+			const db = this.dbClient.db(data['organization_id']);
+			const collection = db.collection(data["collection"]);
+			let insertData = replaceArray(data.data);
+			insertData['organization_id'] = data['organization_id'];
 
 			collection.insertOne(insertData, function(error, result) {
 				if(!error && result){
-					const response  = {...req_data, document_id: `${result.insertedId}`, data: insertData } 
-					self.broadcast(socket, 'createDocument', response, socketInfo)	
+					const response  = {...data, document_id: `${result.insertedId}`, data: insertData }
+					response.data['_id'] = result.insertedId;
+					self.broadcast(socket, 'createDocument', response)	
 				} else {
-					self.wsManager.send(socket, 'ServerError', error, socketInfo);
+					self.wsManager.send(socket, 'ServerError', error);
 				}
 			});
 		}catch(error){
 			console.log('createDocument error', error);
-			self.wsManager.send(socket, 'ServerError', 'error', socketInfo);
+			self.wsManager.send(socket, 'ServerError', 'error');
 		}
 	}
 	
 	/** Read Document **/
-	async readDocument(socket, req_data, socketInfo) {
-		if (!req_data['collection'] || req_data['collection'] == 'null' || typeof req_data['collection'] !== 'string') {
-			this.wsManager.send(socket, 'ServerError', 'error', socketInfo);
+	async readDocument(socket, data) {
+		if (!data['collection'] || data['collection'] == 'null' || typeof data['collection'] !== 'string') {
+			this.wsManager.send(socket, 'ServerError', 'error');
 			return;
 		} 
 		const self = this;
 
 		try {
-			const db = this.dbClient.db(req_data['organization_id']);
-			const collection = db.collection(req_data["collection"]);
+			const db = this.dbClient.db(data['organization_id']);
+			const collection = db.collection(data["collection"]);
 			
-			const query = {
-				"_id": new ObjectId(req_data["document_id"])
-			};
-			if (req_data['organization_id']) {
-				query['organization_id'] = req_data['organization_id'];
+			const {query, sort} = this.getFilters(data);
+			if (data['organization_id']) {
+				query['organization_id'] = data['organization_id'];
 			}
 			
-			collection.find(query).toArray(function(error, result) {
+			collection.find(query).sort(sort).toArray(function(error, result) {
 				if (!error && result && result.length > 0) {
 					let tmp = result[0];
-					if (req_data['exclude_fields']) {
-						req_data['exclude_fields'].forEach(function(field) {
-							delete tmp[field];
-						})
-					}
-					
-					if (req_data.data) {
+										
+					// ToDo: returns values of defined names
+					if (data.returnDocument == false && data.data) {
 						let resp = {};
 						resp['_id'] = tmp['_id']
-						req_data.data.forEach((f) => resp[f] = tmp[f])
+						data.data.forEach((f) => resp[f] = tmp[f])
 						tmp = resp;
 					}
-					
-					self.wsManager.send(socket, 'readDocument', { ...req_data, data: tmp }, socketInfo);
+					data.data = tmp
+					self.wsManager.send(socket, 'readDocument', data);
 				} else {
-					self.wsManager.send(socket, 'readDocument error', req_data, socketInfo);
+					self.wsManager.send(socket, 'readDocument error', data);
 				}
 			});
 		} catch (error) {
-			console.log('readDocument error', error, req_data); 
-			self.wsManager.send(socket, 'ServerError', 'error', socketInfo);
+			console.log('readDocument error', error, data); 
+			self.wsManager.send(socket, 'ServerError', 'error');
 		}
 	}
 
 	/** Update Document **/
-	async updateDocument(socket, req_data, socketInfo) {
+	async updateDocument(socket, data) {
 		const self = this;
-		try {
-			const db = this.dbClient.db(req_data['organization_id']);
-			const collection = db.collection(req_data["collection"]);
-			let objId = new ObjectId();
-			try {
-				if (req_data["document_id"]) {
-					objId = new ObjectId(req_data["document_id"]);
-				}
-			} catch (err) {
-				console.log(err);
-			}
-
-			if (req_data['data'] && req_data['data']['_id'])
-				delete req_data['data']['_id']
-			
-
-			const query = {"_id": objId };
-			let update = {}, projection = {};
-
-
-			if( typeof req_data['data'] === 'object' )	{
-				update['$set'] = {}
-				for (const [key, value] of Object.entries(replaceArray(req_data['data']))) {
-					let val;
-					let valueType = typeof value;
-					switch(valueType) {
-						case 'string':
-							val = value
-							break;
-						case 'number':
-							val = Number(value)
-							break;
-						case 'object':
-							if (Array.isArray(value))
-								val = new Array(...value)
-							else
-								val = new Object(value)
-							break;
-						default:
-							val = value
-					  }
-					update['$set'][key] = val
-				}	
-
-				update['$set']['organization_id'] = req_data['organization_id'];
+		try {			
+			let {query, sort} = this.getFilters(data);
+			if (data['data'] && data['data']['_id'])
+				delete data['data']['_id']
 
+			let update = {}, projection = {}, returnNewDocument = false;
+			if  (data.data) {
+				update['$set'] = this.valueTypes(data.data)
+				update['$set']['organization_id'] = data['organization_id'];
+				if (update['$set']['_id'])
+					delete update['$set']['_id']
 				Object.keys(update['$set']).forEach(x => {
 					projection[x] = 1
 				})
-				
 			}
-
-			if( req_data['deleteName'] ) {
-				update['$unset'] = replaceArray(req_data['deleteName']);
+			
+				
+			if( data['deleteName'] ) {
+				update['$unset'] = replaceArray(data['deleteName']);
 			}
-
-			if( req_data['updateName'] ) {
-				update['$rename'] = replaceArray(req_data['updateName'])
+			
+			if( data['updateName'] ) {
+				update['$rename'] = replaceArray(data['updateName'])
 				for (const [key, value] of Object.entries(update['$rename'])) {
-					let newValue = replaceArray({[value]: value})
-					let oldkey = key;
-					for (const [key] of Object.entries(newValue)) {
-						update['$rename'][oldkey] = key
+					if (/\.([0-9]*)/g.test(key) || /\[([0-9]*)\]/g.test(value)) {
+						console.log('key is array', /\[([0-9]*)\]/g.test(value), /\.([0-9]*)/g.test(key))
+					} else {
+						let newValue = replaceArray({[value]: value})
+						let oldkey = key;
+						for (const [key] of Object.entries(newValue)) {
+							update['$rename'][oldkey] = key
+						}
 					}
 				}
+				returnNewDocument == true
 			}
 
-			collection.updateOne( query, update, {
-					upsert: req_data.upsert || false,
+			const db = this.dbClient.db(data['organization_id']);
+			const collection = db.collection(data["collection"]);
+			collection.findOneAndUpdate( query, update, {
+					returnOriginal: false,
+					returnNewDocument: returnNewDocument || false,
+					upsert: data.upsert || false,
 					projection: projection,
 				}
-			).then((error, result) => {
-				if (!error) {				
-					let response = { ...req_data, data: update['$set'] };
-					self.broadcast(socket, 'updateDocument', response, socketInfo)
+			).then((result) => {
+				if (result) {				
+					update['$set']['_id'] = data.data._id || data.document_id
+					data.data = update['$set']
+					self.broadcast(socket, 'updateDocument', data)
 				} else {
-					self.wsManager.send(socket, 'ServerError', error, socketInfo);
+					self.wsManager.send(socket, 'ServerError', error);
 				}
 			}).catch((error) => {
 				console.log('error', error)
-				self.wsManager.send(socket, 'ServerError', error, socketInfo);
+				self.wsManager.send(socket, 'ServerError', error);
 			});
 			
 		} catch (error) {
 			console.log(error)
-			self.wsManager.send(socket, 'updateDocumentError', error, socketInfo);
+			self.wsManager.send(socket, 'updateDocumentError', error);
 		}
 	}
 	
 	/** Delete Document **/
-	async deleteDocument(socket, req_data, socketInfo) {
+	async deleteDocument(socket, data) {
 		const self = this;
 
 		try {
-			const db = this.dbClient.db(req_data['organization_id']);
-			const collection = db.collection(req_data["collection"]);
+			const db = this.dbClient.db(data['organization_id']);
+			const collection = db.collection(data["collection"]);
 			const query = {
-				"_id": new ObjectId(req_data["document_id"])
+				"_id": new ObjectId(data["document_id"])
 			};
 
 			collection.deleteOne(query, function(error, result) {
 				if (!error) {
-					let response = { ...req_data }
-					self.broadcast(socket, 'deleteDocument', response, socketInfo)
+					self.broadcast(socket, 'deleteDocument', data)
 				} else {
-					self.wsManager.send(socket, 'ServerError', error, socketInfo);
+					self.wsManager.send(socket, 'ServerError', error);
 				}
 			})
 		} catch (error) {
 			console.log(error);
-			self.wsManager.send(socket, 'ServerError', 'error', socketInfo);
+			self.wsManager.send(socket, 'ServerError', 'error');
 		}
 	}
 
+	async readDocuments(socket, data) {		
+		function sleep(ms) {
+			return new Promise((resolve) => {
+				setTimeout(resolve, ms);
+			});
+		}
+
+		const self = this;
+		
+		try {
+			const db = this.dbClient.db(data['organization_id']);
+			const collection = db.collection(data["collection"]);
+			let {query, sort} = this.getFilters(data);
+			collection.find(query).sort(sort).toArray(function(error, result) {
+				if (result) {
+					data['data'] = searchData(result, data.filter)
+					self.wsManager.send(socket, 'readDocuments', data );
+				} else {
+					console.log(error)
+					self.wsManager.send(socket, 'ServerError', error);
+				}
+			})
+		} catch (error) {
+			console.log('readDocuments error', error);
+			this.wsManager.send(socket, 'ServerError', 'error');
+		}
+	}
+	
 	/** Create Collection **/
-	async createCollection(socket, req_data, socketInfo) {
+	async createCollection(socket, data) {
 		const self = this;
 
 		try {
-			const db = this.dbClient.db(req_data['organization_id']);
-			db.createCollection(req_data.collection, function(error, result) {
+			const db = this.dbClient.db(data['organization_id']);
+			db.createCollection(data.collection, function(error, result) {
 				if (!error) {
-					let response = { ...req_data }
-					self.broadcast(socket, 'createCollection', response, socketInfo)
+					self.broadcast(socket, 'createCollection', data)
 				} else {
-					self.wsManager.send(socket, 'ServerError', error, socketInfo);
+					self.wsManager.send(socket, 'ServerError', error);
 				}
 			})
 		} catch (error) {
 			console.log(error);
-			self.wsManager.send(socket, 'ServerError', 'error', socketInfo);
+			self.wsManager.send(socket, 'ServerError', 'error');
 		}
 	}
 
 	/** Update Collection **/
-	async updateCollection(socket, req_data, socketInfo) {
+	async updateCollection(socket, data) {
 		const self = this;
 
 		try {
-			const db = this.dbClient.db(req_data['organization_id']);
-			const collection = db.collection(req_data["collection"]);
-			collection.rename(req_data.target, function(error, result) {
+			const db = this.dbClient.db(data['organization_id']);
+			const collection = db.collection(data["collection"]);
+			collection.rename(data.target, function(error, result) {
 				if (!error) {
-					let response = { ...req_data }
-					self.broadcast(socket, 'updateCollection', response, socketInfo)
+					self.broadcast(socket, 'updateCollection', data)
 				} else {
-					self.wsManager.send(socket, 'ServerError', error, socketInfo);
+					self.wsManager.send(socket, 'ServerError', error);
 				}
 			})
 		} catch (error) {
 			console.log(error);
-			self.wsManager.send(socket, 'ServerError', 'error', socketInfo);
+			self.wsManager.send(socket, 'ServerError', 'error');
 		}
 	}
 
 	/** Delete Collection **/
-	async deleteCollection(socket, req_data, socketInfo) {
+	async deleteCollection(socket, data) {
 		const self = this;
 
 		try {
-			const db = this.dbClient.db(req_data['organization_id']);
-			const collection = db.collection(req_data["collection"]);
+			const db = this.dbClient.db(data['organization_id']);
+			const collection = db.collection(data["collection"]);
 			collection.drop( function(error, result) {
 				if (!error) {
-					let response = { ...req_data }
-					self.broadcast(socket, 'deleteCollection', response, socketInfo)
+					self.broadcast(socket, 'deleteCollection', data)
 				} else {
-					self.wsManager.send(socket, 'ServerError', error, socketInfo);
+					self.wsManager.send(socket, 'ServerError', error);
 				}
 			})
 		} catch (error) {
 			console.log(error);
-			self.wsManager.send(socket, 'ServerError', 'error', socketInfo);
+			self.wsManager.send(socket, 'ServerError', 'error');
 		}
 	}
 	
-	broadcast(socket, component, response, socketInfo) {
-		this.wsManager.broadcast(socket, response.namespace || response['organization_id'], response.room, component, response, socketInfo);
+	async readCollections(socket, data) {
+		try {
+			const self = this;
+			data['collection'] = 'collections'
+			
+			let {query, sort} = this.getFilters(data);
+			const db = this.dbClient.db(data['organization_id']);
+			db.listCollections(query).toArray(function(error, result) {
+				if (!error && result && result.length > 0) {
+					data.data = sortData(result, sort)
+					self.wsManager.send(socket, 'readCollections', data);
+				}
+			})			
+		} catch(error) {
+			console.log('readCollections error', error); 
+			this.wsManager.send(socket, 'ServerError', 'error');
+		}
+	}
+
+	getFilters(data) {
+		let query = {}, sort = {}
+		data.filter = {
+			query: [],
+			sort: [],
+			search: {
+				value: [],
+				type: "or"
+			},
+			startIndex: 0,
+			...data.filter
+		};
+		if (data.filter) {
+
+			query = this.createQuery(data['filter'].query);
+			if (data["document_id"]) {
+				query['_id'] = ObjectId(data["document_id"]);
+			}
+			if (data.filter.sort)
+				data.filter.sort.forEach((order) => {
+					sort[order.name] = order.type
+				});
+		}
+		return {query, sort}
+	}
+
+	createQuery(filters, data) {
+		let query = new Object();
+
+		filters.forEach((item) => {
+			if (!item.name) {
+				return;
+			}
+			var key = item.name;
+			if (!query[key]) {
+				query[key] = {};
+			}
+			
+			if (item.name == "_id") 
+				item.value = ObjectId(item.value)
+			
+			switch (item.operator) {
+				case '$contain':
+					var in_values = [];
+					item.value.forEach(function(v) {
+						in_values.push(new RegExp(".*" + v + ".*", "i"));
+					});
+					
+					query[key] = {$in : in_values }
+					break;
+					
+				case '$range':
+					if (item.value[0] !== null && item.value[1] !== null) {
+						query[key] = {$gte: item.value[0], $lte: item.value[1]};
+					} else if (item.value[0] !== null) {
+						query[key] = {$gte: item.value[0]};
+					} else if (item.value[1] !== null) {
+						query[key] = {$lte: item.value[1]};
+					}
+					break;
+					
+				case '$eq':
+				case '$ne':
+				case '$lt':
+				case '$lte':
+				case '$gt':
+				case '$gte':
+					query[key][item.operator] = item.value[0] || item.value;
+					break;
+				case '$in':
+				case '$nin':
+					query[key][item.operator] = item.value;
+					break;
+				case '$geoWithin':
+					try {
+						let value = JSON.parse(item.value);
+						if (item.type) {
+							query[key]['$geoWithin'] = {
+								[item.type]: value
+							} 
+						}
+					} catch(e) {
+						console.log('geowithin error');
+					}
+					break;
+			}    
+		})
+	
+		//. global search
+		//. we have to set indexes in text fields ex: db.chart.createIndex({ "$**": "text" })
+		// if (data['searchKey']) {
+		//   query["$text"] = {$search: "\"Ni\""};
+		// }
+		return query;
+	}
+
+	valueTypes(data) {
+		let object = {}
+		if( typeof data === 'object' ) {
+			// update['$set'] = {}
+			for (const [key, value] of Object.entries(replaceArray(data))) {
+				let val;
+				let valueType = typeof value;
+				switch(valueType) {
+					case 'string':
+						val = value
+						break;
+					case 'number':
+						val = Number(value)
+						break;
+					case 'object':
+						if (Array.isArray(value))
+							val = new Array(...value)
+						else
+							val = new Object(value)
+						break;
+					default:
+						val = value
+				}
+				object[key] = val
+			}	
+			return object;
+		}
+	}
+
+	broadcast(socket, component, response) {
+		this.wsManager.broadcast(socket, component, response);
 		process.emit('changed-document', response)
 	}
+
 }
 
 module.exports = CoCreateCrud;

package/src/database.js

@@ -7,12 +7,12 @@ class CoCreateDatabases {
 	
 	init() {
 		if (this.wsManager) {
-			this.wsManager.on('readDatabases', (socket, data, socketInfo) => this.readDatabases(socket, data, socketInfo));
+			this.wsManager.on('readDatabases', (socket, data) => this.readDatabases(socket, data));
 		}
 	}
 
 	/** Create Document **/
-	async readDatabases(socket, req_data, socketInfo){
+	async readDatabases(socket, req_data){
 		const self = this;
 		// if(!req_data.data) return;
 
@@ -29,13 +29,13 @@ class CoCreateDatabases {
 			})
 		} catch(error) {
 			console.log('readDatabases error', error);
-			self.wsManager.send(socket, 'ServerError', 'error', socketInfo);
+			self.wsManager.send(socket, 'ServerError', 'error');
 		}
 	}
 	
 	
-	broadcast(socket, component, response, socketInfo) {
-		this.wsManager.broadcast(socket, response.namespace || response['organization_id'], response.room, component, response, socketInfo);
+	broadcast(socket, component, response) {
+		this.wsManager.broadcast(socket, component, response);
 		process.emit('changed-document', response)
 	}
 }

package/src/index.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const crud = require('./crud');
-const list = require('./list');
 const backup = require('./backup');
 const database = require('./database');
 
@@ -14,7 +13,6 @@ class CoCreateCrudServer {
 
     init() {
         new crud(this.wsManager, this.dbClient);
-        new list(this.wsManager, this.dbClient);
         new backup(this.wsManager, this.dbClient);
         new database(this.wsManager, this.dbClient);
     }

package/src/list.js

@@ -1,356 +0,0 @@
-const {ObjectId} = require("mongodb");
-
-class CoCreateList {
-	constructor(wsManager, dbClient) {
-		this.wsManager = wsManager
-		this.dbClient = dbClient
-		this.init()
-	}
-	
-	init() {
-		this.wsManager.on('readDocuments', (socket, data, socketInfo) => this.readDocuments(socket, data, socketInfo));
-		this.wsManager.on('readCollections', (socket, data, socketInfo) => this.readCollections(socket, data, socketInfo));
-	}
-	
-	/**
-	 * 
-	 * 
-		data: {
-			collection: "modules",
-			element: "xxxx",
-			metadata: "",
-			operator: {
-				filters: [{
-					name: 'field1',
-					operator: "$contain | $range | $eq | $ne | $lt | $lte | $gt | $gte | $in | $nin | $geoWithin",
-					value: [v1, v2, ...]
-				}, {
-					....
-				}],
-				orders: [{
-					name: 'field-x',
-					type: 1 | -1
-				}],
-				search: {
-					type: 'or | and',
-					value: [value1, value2]
-				},
-				
-				startIndex: 0 (integer),
-				count: 0 (integer)
-			},
-			
-			//. case fetch document case
-			export: true | false
-			-------- additional response data -----------
-			data: [] // array
-	 }
-	 **/
-	async readDocuments(socket, data, socketInfo) {		
-		function sleep(ms) {
-			return new Promise((resolve) => {
-				setTimeout(resolve, ms);
-			});
-		}
-
-		const self = this;
-		
-		try {
-			const db = this.dbClient.db(data['organization_id']);
-			const collection = db.collection(data["collection"]);
-			let {operator, query, sort} = this.getFilters(data);
-			collection.find(query).sort(sort).toArray(function(error, result) {
-				if (result) {
-					let result_data = self.filterResponse(result, data, operator)
-					self.wsManager.send(socket, 'readDocuments', { ...data, data: result_data, operator, socketInfo });
-				} else {
-					console.log(error)
-					self.wsManager.send(socket, 'ServerError', error, socketInfo);
-				}
-			})
-		} catch (error) {
-			console.log('readDocuments error', error);
-			this.wsManager.send(socket, 'ServerError', 'error', socketInfo);
-		}
-	}
-	
-	async readCollections(socket, data, socketInfo) {
-		try {
-			const self = this;
-			data['collection'] = 'collections'
-			
-			let {operator, query, sort} = this.getFilters(data);
-			const db = this.dbClient.db(data['organization_id']);
-			db.listCollections(query).toArray(function(error, result) {
-				if (!error && result && result.length > 0) {
-					let orderField = Object.keys(sort)[0]
-					if (orderField) {
-						let orderType = sort[orderField];
-						let orderValueType = "";
-						let sortData;
-						if (orderType == '-1') {
-							if (orderValueType == 'number')
-								sortData = result.sort((a, b) => 
-									b[orderField] - a[orderField]
-								);
-							else
-								sortData = result.sort((a, b) => 
-									b[orderField].localeCompare(a[orderField])
-								);
-						} else {
-							if (orderValueType == 'number')
-								sortData = result.sort((a, b) => 
-									a[orderField] - b[orderField]
-								);
-							else
-								sortData = result.sort((a, b) => 
-									a[orderField].localeCompare(b[orderField])
-								);
-							
-						}
-						result = sortData
-					}
-
-					self.wsManager.send(socket, 'readCollections', {...data, data: result }, socketInfo);
-				}
-			})			
-		} catch(error) {
-			console.log('readCollections error', error); 
-			this.wsManager.send(socket, 'ServerError', 'error', socketInfo);
-		}
-	}
-	
-	/**
-	 * function that make query from data
-	 * 
-	 */
-	filterResponse(result, data, operator) {
-		if (operator['search']['type'] == 'and') {
-			result = this.readAndSearch(result, operator['search']['value']);
-		} else {
-			result = this.readOrSearch(result, operator['search']['value']);
-		}
-		
-		const total = result.length;
-		const startIndex = operator.startIndex;
-		const count = operator.count;
-		let result_data = [];
-		
-		if (data.created_ids && data.created_ids.length > 0) {
-			let _nn = (count) ? startIndex : result.length;
-			
-			for (let ii = 0; ii < _nn; ii++) {
-				
-				const selected_item = result[ii];
-				data.created_ids.forEach((fetch_id, index) => {
-					if (fetch_id == selected_item['_id']) {
-						result_data.push({ item: selected_item, position: ii })
-					}
-				})
-			}
-		} else {
-			if (startIndex) result = result.slice(startIndex, total);
-			if (count) result = result.slice(0, count)
-			
-			result_data = result;
-		}
-		operator.startIndex = startIndex
-		operator.count = count
-		operator.total = total
-		return result_data
-	}
-
-	getFilters(data) {
-		let operator = {
-			filters: [],
-			orders: [],
-			search: {
-				value: [],
-				type: "or"
-			},
-			startIndex: 0,
-			...data.operator
-		};
-
-		let query = this.createQuery(operator);
-		let sort = {}
-		operator.orders.forEach((order) => {
-			sort[order.name] = order.type
-		});
-
-		return {operator, query, sort}
-	}
-
-	createQuery(data) {
-		var query = new Object();
-	
-		var filters = data['filters'];
-		
-		filters.forEach((item) => {
-			if (!item.name) {
-				return;
-			}
-			var key = item.name;
-			if (!query[key]) {
-				query[key] = {};
-			}
-			
-			if (item.name == "_id") item.value = item.value.map(v => new ObjectId(v))
-			
-			switch (item.operator) {
-				case '$contain':
-					var in_values = [];
-					item.value.forEach(function(v) {
-						in_values.push(new RegExp(".*" + v + ".*", "i"));
-					});
-					
-					query[key] = {$in : in_values }
-					break;
-					
-				case '$range':
-					if (item.value[0] !== null && item.value[1] !== null) {
-						query[key] = {$gte: item.value[0], $lte: item.value[1]};
-					} else if (item.value[0] !== null) {
-						query[key] = {$gte: item.value[0]};
-					} else if (item.value[1] !== null) {
-						query[key] = {$lte: item.value[1]};
-					}
-					break;
-					
-				case '$eq':
-				case '$ne':
-				case '$lt':
-				case '$lte':
-				case '$gt':
-				case '$gte':
-					query[key][item.operator] = item.value[0];
-					break;
-				case '$in':
-				case '$nin':
-					query[key][item.operator] = item.value;
-					break;
-				case '$geoWithin':
-					try {
-						let value = JSON.parse(item.value);
-						if (item.type) {
-							query[key]['$geoWithin'] = {
-								[item.type]: value
-							} 
-						}
-					} catch(e) {
-						console.log('geowithin error');
-					}
-					break;
-			}    
-		})
-	
-		//. global search
-		//. we have to set indexes in text fields ex: db.chart.createIndex({ "$**": "text" })
-		// if (data['searchKey']) {
-		//   query["$text"] = {$search: "\"Ni\""};
-		// }
-		return query;
-	}
-	
-	
-	//. or operator
-	readOrSearch(results, search) {
-		var tmp
-		if (search && search.length > 0) {
-	
-			tmp = results.filter(function(item) {
-				
-				for (var key in item) {
-					var value = item[key];
-					var __status = false;
-					
-					var str_value = value;
-					
-					if (Array.isArray(str_value) || typeof str_value == 'number') {
-						str_value = str_value.toString();
-					}
-					
-					if (typeof str_value == 'string') {
-						str_value = str_value.toUpperCase();
-					}
-	
-					for (let i = 0; i < search.length; i++) {
-						if (typeof search[i] == 'string' && typeof str_value == 'string') {
-							if (str_value.indexOf(search[i].toUpperCase()) > -1) {
-								__status = true;
-								break;
-							}
-						} else {
-							if (value == search[i]) {
-								__status = true;
-								break;
-							}
-						}
-					}
-					
-					if (__status) {
-						return true;
-					}
-				}
-				
-				return false;
-			})  
-		} else {
-			tmp = results;
-		}
-		
-		return tmp;
-	}
-	
-	
-	//. and operator
-	readAndSearch(results, search) {
-		var tmp
-		if (search && search.length > 0) {
-					
-			tmp = results.filter(function(item) {
-	
-				for (let i = 0; i < search.length; i++) {
-					var __status = false;
-					
-					for (var key in item) {
-						var value = item[key];
-						
-						if (typeof search[i] == 'string') {
-							
-							if (Array.isArray(value) || typeof value == 'number' ) {
-								value = value.toString();
-							} 
-							
-							if (typeof value == 'string') {
-								value = value.toUpperCase();  
-								if (value.indexOf(search[i].toUpperCase()) > -1) {
-									__status = true;
-									break;
-								}
-							}
-							
-						} else {
-							if (value == search[i]) {
-								__status = true;
-								break;
-							}
-						}
-					}
-					
-					if (!__status) {
-						return false;  
-					}
-				}
-				
-				return true;
-			})  
-		} else {
-			tmp = results;
-		}
-		
-		return tmp;
-	}	
-}
-
-module.exports = CoCreateList;