@cocreate/api 1.2.25 → 1.2.29

package/CHANGELOG.md

@@ -1,3 +1,32 @@
+## [1.2.29](https://github.com/CoCreate-app/CoCreate-api/compare/v1.2.28...v1.2.29) (2022-02-16)
+
+
+### Bug Fixes
+
+* update dependencies ([aea132d](https://github.com/CoCreate-app/CoCreate-api/commit/aea132d9e4102ee866f951de88a63c4d3e6cce14))
+
+## [1.2.28](https://github.com/CoCreate-app/CoCreate-api/compare/v1.2.27...v1.2.28) (2022-02-16)
+
+
+### Bug Fixes
+
+* update action param to name ([c20f956](https://github.com/CoCreate-app/CoCreate-api/commit/c20f95664270d652c4e9f3205b461c5a64b39c62))
+* update m_instance.id to m_instance.name ([38da5df](https://github.com/CoCreate-app/CoCreate-api/commit/38da5dfda83f2313463fb6f3e25e92f1a16bbf79))
+
+## [1.2.27](https://github.com/CoCreate-app/CoCreate-api/compare/v1.2.26...v1.2.27) (2022-02-11)
+
+
+### Bug Fixes
+
+* define host will be used when creating socket ([e7c4a88](https://github.com/CoCreate-app/CoCreate-api/commit/e7c4a8846b1131c98150f923e76ab42ec8bfe821))
+
+## [1.2.26](https://github.com/CoCreate-app/CoCreate-api/compare/v1.2.25...v1.2.26) (2022-02-10)
+
+
+### Bug Fixes
+
+* bump dependencies ([19c4eb9](https://github.com/CoCreate-app/CoCreate-api/commit/19c4eb979a2605716a2ba7d4702a23242e06a9d5))
+
 ## [1.2.25](https://github.com/CoCreate-app/CoCreate-api/compare/v1.2.24...v1.2.25) (2022-02-07)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/api",
-  "version": "1.2.25",
+  "version": "1.2.29",
   "description": "A simple api helper component in vanilla javascript used by JavaScript developers to create thirdparty api intergrations. CoCreate-api includes the client component and server side for api processing. Thirdparty apis can be accessible using HTML5 attributes and/or JavaScript API. ",
   "keywords": [
     "thirdparty-api-intergration",
@@ -62,12 +62,12 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/actions": "^1.3.30",
-    "@cocreate/crud-client": "^1.4.45",
-    "@cocreate/docs": "^1.2.67",
-    "@cocreate/elements": "^1.6.8",
-    "@cocreate/hosting": "^1.2.62",
-    "@cocreate/render": "^1.5.4",
-    "@cocreate/socket-client": "^1.4.20"
+    "@cocreate/actions": "^1.3.33",
+    "@cocreate/crud-client": "^1.4.47",
+    "@cocreate/docs": "^1.2.69",
+    "@cocreate/elements": "^1.6.11",
+    "@cocreate/hosting": "^1.2.64",
+    "@cocreate/render": "^1.5.7",
+    "@cocreate/socket-client": "^1.4.22"
   }
 }

package/src/client.js

@@ -21,56 +21,46 @@ const CoCreateApi = {
 			this.modules[name] = m_instance;
 			
 			socketApi.listen(name, (data) => {
-				self.__responseProcess(name, data);
+				self.__response(name, data);
 			});
 			
-			//. register actions
-			
-			if (Array.isArray(m_instance['actions'])) {
-				m_instance['actions'].forEach((action) => {
-					if (typeof m_instance[`action_${action}`] !== 'function') {
-						m_instance[`action_${action}`] = function(element) {
-							self.__commonAction(m_instance.id, action, element);
-						};
-					} 
-					CoCreateAction.init({
-						action: action,
-						endEvent: action,
-						callback: (btn) => {
-							m_instance[`action_${action}`](btn);
-						},
-					});
+			for (const [action, functions] of Object.entries(m_instance['actions'])){
+				if (typeof functions.request !== 'function') {
+					functions.request = self.__request;
+				} 
+				CoCreateAction.init({
+					name: action,
+					endEvent: action,
+					callback: (element) => {
+						functions.request(m_instance.name, action, element);
+					},
 				});
 			}
 		}
 	},
-	
-	__responseProcess: function(id, data) {
-		const {type, response} = data;
-		const m_instance = this.modules[id];
-		
-		if (type && response && m_instance) {
-		
-			if ( typeof m_instance[`render_${type}`] === 'function') {
-				m_instance[`render_${type}`](response);
-			}
-			
-			this.render(type, response);
-			
-			document.dispatchEvent(new CustomEvent(type, {
-				detail: {
-					data: response
-				}
-			}));
-		}
-	},
-	
-	__commonAction: function(id, action, element) {
+
+	__request: function(id, action, element) {
 		const form = element.closest("form") || document;
 		let data = CoCreateApi.getFormData(id, action,  form);
 		CoCreateApi.send(id, action, data);
 	},
-	
+
+	__response: function(id, data) {
+		const {type, response} = data;
+		const m_instance = this.modules[id];
+		const functions = m_instance.actions[type]
+		if (typeof functions.response === 'function') {
+			functions.response(response);
+		}
+		else
+			this.render(type, response);
+		
+		document.dispatchEvent(new CustomEvent(type, {
+			detail: {
+				data: response
+			}
+		}));
+	},	
 	
 	getFormData: function(id, action, form){
 		const mainAttr = id;
@@ -150,8 +140,9 @@ const CoCreateApi = {
 	
 	send : function(module, action, data){ 
 		let request_data = this.getCommonParams(data || {});
-		request_data = {...request_data, data};
-		socketApi.send(module, {type: action, data: request_data});
+		data = {...request_data, type: action, data};
+		socketApi.send(module, data);
+		console.log('data', data)
 	},
 	
 	render: function(action, data) {
@@ -163,8 +154,9 @@ const CoCreateApi = {
 	
 	getCommonParams: function(info) {
 		return {
-			"apiKey":           info.apiKey || config.apiKey,
-			"organization_id":  info.organization_id || config.organization_Id,
+			"apiKey": info.apiKey || config.apiKey,
+			"organization_id": info.organization_id || config.organization_Id,
+			"host": info.host || config.host
 		};
 	}
 };

package/src/server.js

@@ -1,54 +1,49 @@
 const crud = require('@cocreate/crud-client')
-const CoCreateSocketClient = require('@cocreate/socket-client')
-let socket = new CoCreateSocketClient("ws");
+const socketClient = require('@cocreate/socket-client')
+let socket = new socketClient("ws");
 
 crud.setSocket(socket);
 
 var api = ( ()=> {
   return {
-  	send_response : (wsManager,socket,obj,send_response) => {
-    	console.log("Response   TO-> "+send_response)
+  	send_response: (wsManager, socket, obj, send_response) => {
+    	console.log(send_response, " Response Sent")
 	    wsManager.send(socket, send_response, obj)
 	},
 	  
-	 handleError : (wsManager,socket, type, error,module_id)=>{
-	      const response = {
-	        'object': 'error',
-	        'data':error || error.response || error.response.data || error.response.body || error.message || error,
-	      };
-	      wsManager.send(socket, module_id, { type, response })
-	      //send_response(wsManager, socket, { type, response }, module_id);
+	handleError: (wsManager, socket, type, error, module_id)=>{
+		const response = {
+			'object': 'error',
+			'data':error || error.response || error.response.data || error.response.body || error.message || error,
+		};
+		wsManager.send(socket, module_id, { type, response })
 	},
-	getOrg : async (config, module) =>{
-	 	console.log("config WS utils==== ",config)
+
+	getOrg: async (config, module) =>{
 
 		socket.create({
 			namespace: config["organization_id"],
 			room: null,
-			host: "server.cocreate.app:8088"
+			host: config["host"]
 		})
-	    const event = "getOrg";
-	    
-	    
-	    console.log("Org_id => ",config["organization_id"])
-	    
-	    let org_row = await crud.readDocument({
+
+		let org = await crud.readDocument({
 	        collection: "organizations",
 	        name:"name",
 	        document_id: config["organization_id"],
-	        event,
 	        apiKey: config["apiKey"],
-		    organization_id: '5de0387b12e200ea63204d6c'
+		    organization_id: config["organization_id"]
 	    });
 
 	    try{
-			org_row = org_row["data"];
-		  }catch(e){
-			  console.log(module," Error GET ORG  in : ",e);
+			org = org["data"];
+		}catch(e){
+			console.log(module," Error GET ORG  in : ",e);
 			return false;
-		  }
-		 return org_row;
+		}
+		return org;
 	},
+
 	getOrgInRoutesbyHostname : async (config, hostname) =>{
  		var socket_config = {
   		    "config": {
@@ -59,63 +54,60 @@ var api = ( ()=> {
   		    "host": "server.cocreate.app:8088"
   		};
   		
-	  		socket.create({
-				namespace: socket_config.config.organization_Id,
-				room: null,
-				host: socket_config.host
-			})
+		socket.create({
+			namespace: socket_config.config.organization_Id,
+			room: null,
+			host: socket_config.host
+		})
 	
+		let data2 = await crud.readDocumentList({
+			collection: "organizations",
+			operator: {
+				filters: [{
+					name: 'domains',
+					operator: "$in",
+					value: [hostname]
+				}],
+			},
+			is_collection: false,
+			apiKey: config["config"]["apiKey"],
+			organization_id: config["config"]["organization_id"]
+		});
 
-	  		 let data2 = await crud.readDocumentList({
-		        collection: "organizations",
-		        operator: {
-		  				filters: [{
-		  					name: 'domains',
-		  					operator: "$in",
-		  					value: [hostname]
-		  				}],
-		  				// orders: [],
-		  				// startIndex: 0,
-		  				// search: { type: 'or', value: []}
-		        },
-		        is_collection: false,
-		        apiKey: config["config"]["apiKey"],
-			    organization_id: config["config"]["organization_id"]
-		    });
-
-	     //let data2 = await crud.listenAsync(eventGetOrg);
-	     console.log("data2 ===",data2)
-	   
-		 var org = data2["data"][0]
+		//let data2 = await crud.listenAsync(eventGetOrg);
+		console.log("data2 ===",data2)
 	
-		 var socket_config = {
-			    "config": {
-			        "apiKey": org["apiKey"],
-			        // "securityKey": org["securityKey"],
-			        "organization_Id": org["_id"].toString(),
-			    },
-			    "prefix": "ws",
-			    "host": "server.cocreate.app:8088"
-			}
-			//other connection
+		var org = data2["data"][0]
+
+		var socket_config = {
+			"config": {
+				"apiKey": org["apiKey"],
+				"organization_Id": org["_id"].toString(),
+			},
+			"prefix": "ws",
+			"host": "server.cocreate.app:8088"
+		}
+
+		//other connection
 		socket.create({
-		  namespace: socket_config.config.organization_Id,
+		  	namespace: socket_config.config.organization_Id,
 			room: null,
 			host: socket_config.host
 		})
+
 	    // socket.setGlobalScope(socket_config.config.organization_id)
-		 let myOrg = await crud.readDocumentList({
-		      collection: "organizations",
-		      operator: {
-					filters: [{
-						name: '_id',
-						operator: "$eq",
-						value: [org["_id"].toString()]
-					}],
-					orders: [],
-	  				startIndex: 0,
-	  				search: { type: 'or', value: []}
-		      },
+		let myOrg = await crud.readDocumentList({
+			collection: "organizations",
+			operator: {
+				filters: [{
+					name: '_id',
+					operator: "$eq",
+					value: [org["_id"].toString()]
+				}],
+				orders: [],
+				startIndex: 0,
+				search: { type: 'or', value: []}
+			},
 	         is_collection: false,
 	         apiKey: org["apiKey"],
 		     organization_id: org["_id"]
@@ -124,7 +116,7 @@ var api = ( ()=> {
 	    return result;
 	 }  
 	
-  } // 
+  }
 })();
 
 module.exports = api;