@cocreate/api 1.2.27 → 1.2.28

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/api",
-  "version": "1.2.27",
+  "version": "1.2.28",
   "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",

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,9 +154,9 @@ const CoCreateApi = {
 	
 	getCommonParams: function(info) {
 		return {
-			"apiKey":           info.apiKey || config.apiKey,
-			"organization_id":  info.organization_id || config.organization_Id,
-			"host":  info.host || config.host
+			"apiKey": info.apiKey || config.apiKey,
+			"organization_id": info.organization_id || config.organization_Id,
+			"host": info.host || config.host
 		};
 	}
 };

package/src/server.js

@@ -11,7 +11,7 @@ var api = ( ()=> {
 	    wsManager.send(socket, send_response, obj)
 	},
 	  
-	 handleError: (wsManager,socket, type, error,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,
@@ -74,20 +74,21 @@ var api = ( ()=> {
 			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"],
-			        "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,
 			room: null,