@cocreate/crud-server 1.3.3 → 1.4.1

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## [1.4.1](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.4.0...v1.4.1) (2022-05-06)
+
+
+### Bug Fixes
+
+* replace ObjectID with ObjectId due to mongodb depreciation ([93e4294](https://github.com/CoCreate-app/CoCreate-crud-server/commit/93e42944447357ec6a244b72ce968bbd8ff5c93d))
+* update config organization_Id to organization_id ([996611b](https://github.com/CoCreate-app/CoCreate-crud-server/commit/996611baf2b2d3afbf895ef193ae15ba7226e77a))
+
+# [1.4.0](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.3.4...v1.4.0) (2022-04-01)
+
+
+### Features
+
+* readCollections to return a list of collections ([2ad15d4](https://github.com/CoCreate-app/CoCreate-crud-server/commit/2ad15d43baf22c6dabbf56582cac182dec8876ad))
+
+## [1.3.4](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.3.3...v1.3.4) (2022-03-06)
+
+
+### Bug Fixes
+
+* broadcast_sender if condition removed and handeled by socket ([c2a0a6d](https://github.com/CoCreate-app/CoCreate-crud-server/commit/c2a0a6d79d331e56160cd9ddaf8a7e521e2270e8))
+* removed param isExact from broadcast as it can be handled by param room ([e709e36](https://github.com/CoCreate-app/CoCreate-crud-server/commit/e709e366493759399f371f2ffc3c630e415f8daa))
+* update param roomInfo to socketInfo ([f50edc9](https://github.com/CoCreate-app/CoCreate-crud-server/commit/f50edc91ee4695f6a652fd8a8c943feac24ba80a))
+
 ## [1.3.3](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.3.2...v1.3.3) (2022-03-05)
 
 

package/CoCreate.config.js

@@ -1,7 +1,7 @@
 module.exports = {
     config: {
         "apiKey": "2061acef-0451-4545-f754-60cf8160",
-        "organization_Id": "5ff747727005da1c272740ab",
+        "organization_id": "5ff747727005da1c272740ab",
         "host": "general.cocreate.app"
     },
     "sources": [

package/docs/index.html

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/crud-server",
-  "version": "1.3.3",
+  "version": "1.4.1",
   "description": "CoCreate-crud-server",
   "keywords": [
     "cocreate-crud",

package/src/backup.js

@@ -13,11 +13,11 @@ class CoCreateBackup {
 	
 	init() {
 		if (this.wsManager) {
-			// this.wsManager.on('exportDB',		(socket, data, roomInfo) => this.exportData(socket, data, roomInfo));
-			// this.wsManager.on('importDB',		(socket, data, roomInfo) => this.importData(socket, data, roomInfo));
-			// this.wsManager.on('importFile2DB',	(socket, data, roomInfo) => this.importData(socket, data, roomInfo));
+			// 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('downloadData',	(socket, data, roomInfo) => this.downloadData(socket, data, roomInfo))
+			// this.wsManager.on('downloadData',	(socket, data, socketInfo) => this.downloadData(socket, data, socketInfo))
 		}
 	}
 	
@@ -28,13 +28,13 @@ class CoCreateBackup {
 	 	data: JSON data
 	 }
 	**/
-	// async downloadData(socket, data, roomInfo) {
+	// async downloadData(socket, data, socketInfo) {
 	// 	const export_type = data.type || "json";
 		
 	// 	try {
 	// 		let binaryData = null;
 	// 		const result = data.data;
-	// 		const orgId = roomInfo ? roomInfo.orgId : "";
+	// 		const orgId = socketInfo ? socketInfo.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, roomInfo) {
+	// async exportData(socket, data, socketInfo) {
 	// 	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 = roomInfo ? roomInfo.orgId : "";
+	// 		const orgId = socketInfo ? socketInfo.orgId : "";
 			
 	// 		var query = {};
 			
@@ -92,13 +92,13 @@ class CoCreateBackup {
 	// 	}
 	// }
 	
-	// async setImportData(socket, data, roomInfo) {
+	// async setImportData(socket, data, socketInfo) {
 	// 	this.importCollection = data['collection']
 	// 	this.importType = data['import_type'];
 	// 	this.importDB = data['namespace'];
 	// }
 
-	// async importData(socket, data, roomInfo) {
+	// async importData(socket, data, socketInfo) {
 	// 	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 = roomInfo ? roomInfo.orgId : "";
+	// 	// const orgId = socketInfo ? socketInfo.orgId : "";
 	// 	if (!importCollection || !importType) {
 	// 		return;
 	// 	}

package/src/crud.js

@@ -1,4 +1,4 @@
-const {ObjectID} = require("mongodb");
+const {ObjectId} = require("mongodb");
 const {encodeObject, replaceArray} = require("./utils.crud.js")
 
 
@@ -11,15 +11,15 @@ class CoCreateCrud {
 	
 	init() {
 		if (this.wsManager) {
-			this.wsManager.on('createDocument', (socket, data, roomInfo) => this.createDocument(socket, data, roomInfo));
-			this.wsManager.on('readDocument',	(socket, data, roomInfo) => this.readDocument(socket, data, roomInfo))
-			this.wsManager.on('updateDocument', (socket, data, roomInfo) => this.updateDocument(socket, data, roomInfo))
-			this.wsManager.on('deleteDocument', (socket, data, roomInfo) => this.deleteDocument(socket, data, roomInfo))
+			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))
 		}
 	}
 
 	/** Create Document **/
-	async createDocument(socket, req_data, roomInfo){
+	async createDocument(socket, req_data, socketInfo){
 		const self = this;
 		if(!req_data.data) return;
 		
@@ -30,25 +30,25 @@ class CoCreateCrud {
 
 			collection.insertOne(insertData, function(error, result) {
 				if(!error && result){
-					const response  = {...req_data, document_id: result.ops[0]._id, data:result.ops[0] } 
+					const response  = {...req_data, document_id: `${result.insertedId}`, data: insertData } 
 					// let isFlat = req_data.isFlat == false ? false : true;
 					// const response_data = isFlat ? encodeObject(response) : response;
 					// const response_data = response;
-					self.broadcast('createDocument', socket, req_data, response, roomInfo)	
+					self.broadcast('createDocument', socket, response, socketInfo)	
 				} else {
-					self.wsManager.send(socket, 'ServerError', error, null, roomInfo);
+					self.wsManager.send(socket, 'ServerError', error, null, socketInfo);
 				}
 			});
 		}catch(error){
 			console.log('createDocument error', error);
-			self.wsManager.send(socket, 'ServerError', 'error', null, roomInfo);
+			self.wsManager.send(socket, 'ServerError', 'error', null, socketInfo);
 		}
 	}
 	
 	/** Read Document **/
-	async readDocument(socket, req_data, roomInfo) {
+	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', null, roomInfo);
+			this.wsManager.send(socket, 'ServerError', 'error', null, socketInfo);
 			return;
 		} 
 		const self = this;
@@ -58,7 +58,7 @@ class CoCreateCrud {
 			const collection = db.collection(req_data["collection"]);
 			
 			const query = {
-				"_id": new ObjectID(req_data["document_id"])
+				"_id": new ObjectId(req_data["document_id"])
 			};
 			if (req_data['organization_id']) {
 				query['organization_id'] = req_data['organization_id'];
@@ -81,27 +81,27 @@ class CoCreateCrud {
 					}
 					
 					let isFlat = req_data.isFlat == true ? true : false;
-					self.wsManager.send(socket, 'readDocument', { ...req_data, data: isFlat ? encodeObject(tmp) : tmp }, req_data['organization_id'], roomInfo);
+					self.wsManager.send(socket, 'readDocument', { ...req_data, data: isFlat ? encodeObject(tmp) : tmp }, req_data['organization_id'], socketInfo);
 				} else {
-					self.wsManager.send(socket, 'ServerError', error, null, roomInfo);
+					self.wsManager.send(socket, 'ServerError', error, null, socketInfo);
 				}
 			});
 		} catch (error) {
 			console.log('readDocument error', error); 
-			self.wsManager.send(socket, 'ServerError', 'error', null, roomInfo);
+			self.wsManager.send(socket, 'ServerError', 'error', null, socketInfo);
 		}
 	}
 
 	/** Update Document **/
-	async updateDocument(socket, req_data, roomInfo) {
+	async updateDocument(socket, req_data, socketInfo) {
 		const self = this;
 		try {
 			const db = this.dbClient.db(req_data['organization_id']);
 			const collection = db.collection(req_data["collection"]);
-			let objId = new ObjectID();
+			let objId = new ObjectId();
 			try {
 				if (req_data["document_id"]) {
-					objId = new ObjectID(req_data["document_id"]);
+					objId = new ObjectId(req_data["document_id"]);
 				}
 			} catch (err) {
 				console.log(err);
@@ -132,10 +132,10 @@ class CoCreateCrud {
 
 				if(req_data['unset']) response['delete_fields'] = req_data['unset'];
 				
-				self.broadcast('updateDocument', socket, req_data, response, roomInfo)
+				self.broadcast('updateDocument', socket, response, socketInfo)
 			}).catch((error) => {
 				console.log('error', error)
-				self.wsManager.send(socket, 'ServerError', error, null, roomInfo);
+				self.wsManager.send(socket, 'ServerError', error, null, socketInfo);
 			});
 			
 		} catch (error) {
@@ -145,42 +145,32 @@ class CoCreateCrud {
 	}
 	
 	/** Delete Document **/
-	async deleteDocument(socket, req_data, roomInfo) {
+	async deleteDocument(socket, req_data, socketInfo) {
 		const self = this;
 
 		try {
 			const db = this.dbClient.db(req_data['organization_id']);
 			const collection = db.collection(req_data["collection"]);
 			const query = {
-				"_id": new ObjectID(req_data["document_id"])
+				"_id": new ObjectId(req_data["document_id"])
 			};
 
 			collection.deleteOne(query, function(error, result) {
 				if (!error) {
 					let response = { ...req_data }
-					self.broadcast('deleteDocument', socket, req_data, response, roomInfo)
+					self.broadcast('deleteDocument', socket, response, socketInfo)
 				} else {
-					self.wsManager.send(socket, 'ServerError', error, null, roomInfo);
+					self.wsManager.send(socket, 'ServerError', error, null, socketInfo);
 				}
 			})
 		} catch (error) {
 			console.log(error);
-			self.wsManager.send(socket, 'ServerError', 'error', null, roomInfo);
+			self.wsManager.send(socket, 'ServerError', 'error', null, socketInfo);
 		}
 	}
 	
-	broadcast(component, socket, req_data, response, roomInfo) {
-		if (req_data.broadcast_sender != false) {
-			this.wsManager.send(socket, component, { ...response, element: req_data['element']}, req_data['organization_id'], roomInfo);
-		}
-			
-		if (req_data.broadcast !== false) {
-			if (req_data.room) {
-				this.wsManager.broadcast(socket, req_data.namespace || req_data['organization_id'] , req_data.room, component, response, true, roomInfo);
-			} else {
-				this.wsManager.broadcast(socket, req_data.namespace || req_data['organization_id'], null, component, response, true, roomInfo)	
-			}
-		}
+	broadcast(component, socket, response, socketInfo) {
+		this.wsManager.broadcast(socket, response.namespace || response['organization_id'], response.room, component, response, socketInfo);
 		process.emit('changed-document', response)
 	}
 }

package/src/list.js

@@ -1,4 +1,4 @@
-const {ObjectID} = require("mongodb");
+const {ObjectId} = require("mongodb");
 
 class CoCreateList {
 	constructor(wsManager, dbClient) {
@@ -8,8 +8,8 @@ class CoCreateList {
 	}
 	
 	init() {
-		this.wsManager.on('readDocumentList', (socket, data, roomInfo) => this.readDocumentList(socket, data, roomInfo));
-		this.wsManager.on('readCollectionList', (socket, data, roomInfo) => this.readCollectionList(socket, data, roomInfo));
+		this.wsManager.on('readDocumentList', (socket, data, socketInfo) => this.readDocumentList(socket, data, socketInfo));
+		this.wsManager.on('readCollections', (socket, data, socketInfo) => this.readCollections(socket, data, socketInfo));
 	}
 	
 	/**
@@ -40,26 +40,23 @@ class CoCreateList {
 				count: 0 (integer)
 			},
 			
-			is_collection: true | false,
 			//. case fetch document case
 			export: true | false
 			-------- additional response data -----------
 			data: [] // array
 	 }
 	 **/
-	async readDocumentList(socket, req_data, roomInfo) {		
+	async readDocumentList(socket, req_data, socketInfo) {		
 		function sleep(ms) {
 			return new Promise((resolve) => {
 				setTimeout(resolve, ms);
 			});
 		}
-		
-		// await sleep(3000)
 
 		const self = this;
 		
 		if (req_data['is_collection']) {
-			var result = await this.readCollectionList(socket, req_data, roomInfo);
+			var result = await this.readCollections(socket, req_data, socketInfo);
 			return;
 		}
 		
@@ -116,42 +113,33 @@ class CoCreateList {
 						
 						result_data = result;
 					}
-					self.wsManager.send(socket, 'readDocumentList', { ...req_data, data: result_data, operator: {...operator, total: total}}, req_data['organization_id'], roomInfo);
+					self.wsManager.send(socket, 'readDocumentList', { ...req_data, data: result_data, operator: {...operator, total: total}}, req_data['organization_id'], socketInfo);
 				} else {
 					console.log(error)
-					self.wsManager.send(socket, 'ServerError', error, null, roomInfo);
+					self.wsManager.send(socket, 'ServerError', error, null, socketInfo);
 				}
 			})
 		} catch (error) {
 			console.log('readDocumentList error', error);
-			this.wsManager.send(socket, 'ServerError', 'error', null, roomInfo);
+			this.wsManager.send(socket, 'ServerError', 'error', null, socketInfo);
 		}
 	}
 	
-	async readCollectionList(socket, data, roomInfo) {
+	async readCollections(socket, data, socketInfo) {
 		try {
-			var collections = [];
-			const db = this.dbClient.db(req_data['organization_id']);
-			collections = await db.listCollections().toArray().then(infos => {
-				var result = [];
-				infos.forEach(function(item) {
-					let __uuid = item.info.uuid.toString('hex')
-					result.push({
-						name: item.name,
-						_id: __uuid,
-						id: __uuid,
-					});
-				})
-				return result;
-			})
-			
-			this.wsManager.send(socket, 'readCollectionList', {...data, data: collections }, data['organization_id'], roomInfo);
+			const self = this;
+			const db = this.dbClient.db(data['organization_id']);
+			db.listCollections().toArray(function(error, result) {
+				if (!error && result && result.length > 0) {
+					self.wsManager.send(socket, 'readCollections', {...data, data: result }, data['organization_id'], socketInfo);
+				}
+			})			
 		} catch(error) {
-			this.wsManager.send(socket, 'ServerError', 'error', null, roomInfo);
+			console.log('readCollections error', error); 
+			this.wsManager.send(socket, 'ServerError', 'error', null, socketInfo);
 		}
 	}
 	
-	
 	/**
 	 * function that make query from data
 	 * 
@@ -170,7 +158,7 @@ class CoCreateList {
 				query[key] = {};
 			}
 			
-			if (item.name == "_id") item.value = item.value.map(v => new ObjectID(v))
+			if (item.name == "_id") item.value = item.value.map(v => new ObjectId(v))
 			
 			switch (item.operator) {
 				case '$contain':