@cocreate/api 1.1.35 → 1.1.39

package/CHANGELOG.md

@@ -1,3 +1,32 @@
+## [1.1.39](https://github.com/CoCreate-app/CoCreate-api/compare/v1.1.38...v1.1.39) (2021-10-29)
+
+
+### Bug Fixes
+
+* update dependencies ([6786fd8](https://github.com/CoCreate-app/CoCreate-api/commit/6786fd820f20450de3752baf1209a36bedab335e))
+
+## [1.1.38](https://github.com/CoCreate-app/CoCreate-api/compare/v1.1.37...v1.1.38) (2021-10-16)
+
+
+### Bug Fixes
+
+* fixed bug event name cant be found when socket-client used on server side ([c5d8246](https://github.com/CoCreate-app/CoCreate-api/commit/c5d8246a77cb77d92446139c92737819dec06967))
+
+## [1.1.37](https://github.com/CoCreate-app/CoCreate-api/compare/v1.1.36...v1.1.37) (2021-10-16)
+
+
+### Bug Fixes
+
+* updated create socket ([623c743](https://github.com/CoCreate-app/CoCreate-api/commit/623c7438ee9a3434bb72021c04e6a16358183284))
+* updated dependency ([d5b6740](https://github.com/CoCreate-app/CoCreate-api/commit/d5b674081a59e56d4b359a62d00e321b93fad5c2))
+
+## [1.1.36](https://github.com/CoCreate-app/CoCreate-api/compare/v1.1.35...v1.1.36) (2021-10-16)
+
+
+### Bug Fixes
+
+* update socket package to fix bug in docs ([ad4cf54](https://github.com/CoCreate-app/CoCreate-api/commit/ad4cf54d06aa691e46014236940f6414d73a7761))
+
 ## [1.1.35](https://github.com/CoCreate-app/CoCreate-api/compare/v1.1.34...v1.1.35) (2021-10-16)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/api",
-  "version": "1.1.35",
+  "version": "1.1.39",
   "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,11 +62,11 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/action": "^1.3.2",
-    "@cocreate/crud-client": "^1.4.10",
-    "@cocreate/docs": "^1.2.37",
-    "@cocreate/hosting": "^1.2.33",
-    "@cocreate/render": "^1.3.3",
-    "@cocreate/socket-client": "^1.3.0"
+    "@cocreate/action": "^1.3.4",
+    "@cocreate/crud-client": "^1.4.16",
+    "@cocreate/docs": "^1.2.43",
+    "@cocreate/hosting": "^1.2.37",
+    "@cocreate/render": "^1.3.5",
+    "@cocreate/socket-client": "^1.3.7"
   }
 }

package/src/client.js

@@ -10,6 +10,8 @@ const CoCreateApi = {
 	
 	init: function({name, module}) {
 		this.register(name, module);
+		if (!socketApi.sockets.size)
+			socketApi.create(window.config);
 	},
 	
 	register: function(name, m_instance) {
@@ -164,7 +166,7 @@ const CoCreateApi = {
 	},
 	
 	send : function(module, action, data){ 
-		let request_data = this.getCommonParamsExtend(data || {});
+		let request_data = this.getCommonParams(data || {});
 		request_data = {...request_data, data};
 		socketApi.send(module, {type: action, data: request_data});
 	},
@@ -176,24 +178,7 @@ const CoCreateApi = {
 		});
 	},
 	
-	createApiSocket: function(host, namespace) {
-		if (namespace) {
-			socketApi.create({
-				namespace: namespace, 
-				room: null,
-				host: host
-			});
-			socketApi.setGlobalScope(namespace);
-		} else {
-			socketApi.create({
-				namespace: null, 
-				room: null,
-				host: host
-			});
-		}
-	},
-	
-	getCommonParamsExtend: function(info) 
+	getCommonParams: function(info) 
 	{
 		return {
 			"apiKey":           info.apiKey || config.apiKey,
@@ -201,10 +186,5 @@ const CoCreateApi = {
 		}
 	}
 }
-
-CoCreateApi.createApiSocket(
-	window.config.host ? window.config.host : 'server.cocreate.app',
-	window.config.organization_Id
-);
-
+                
 export default CoCreateApi;

package/src/server.js

@@ -32,7 +32,7 @@ var api = ( ()=> {
 	    
 	    console.log("Org_id => ",config["organization_id"])
 	    
-	    crud.readDocument({
+	    let org_row = await crud.readDocument({
 	        collection: "organizations",
 	        name:"name",
 	        document_id: config["organization_id"],
@@ -40,9 +40,9 @@ var api = ( ()=> {
 	        apiKey: config["apiKey"],
 		    organization_id: '5de0387b12e200ea63204d6c'
 	    });
-	    let org_row = await crud.listenAsync(event);
+
 	    try{
-			org_row =org_row["data"];
+			org_row = org_row["data"];
 		  }catch(e){
 			  console.log(module," Error GET ORG  in : ",e);
 			return false;
@@ -53,7 +53,6 @@ var api = ( ()=> {
  		var socket_config = {
   		    "config": {
   		        "apiKey": config["config"]["apiKey"],
-  		        // "securityKey": config["config"]["securityKey"],
   		        "organization_Id": config["config"]["organization_id"],
   		    },
   		    "prefix": "ws",
@@ -66,9 +65,8 @@ var api = ( ()=> {
 				host: socket_config.host
 			})
 	
-	  		let eventGetOrg = "getOrginMaster";
-	  		
-	  		 crud.readDocumentList({
+
+	  		 let data2 = await crud.readDocumentList({
 		        collection: "organizations",
 		        operator: {
 		  				filters: [{
@@ -80,14 +78,12 @@ var api = ( ()=> {
 		  				// startIndex: 0,
 		  				// search: { type: 'or', value: []}
 		        },
-		        event: eventGetOrg,
 		        is_collection: false,
 		        apiKey: config["config"]["apiKey"],
-			    // securityKey: config["config"]["securityKey"],
 			    organization_id: config["config"]["organization_id"]
 		    });
 
-	     let data2 = await crud.listenAsync(eventGetOrg);
+	     //let data2 = await crud.listenAsync(eventGetOrg);
 	     console.log("data2 ===",data2)
 	   
 		 var org = data2["data"][0]
@@ -108,25 +104,22 @@ var api = ( ()=> {
 			host: socket_config.host
 		})
 	    // socket.setGlobalScope(socket_config.config.organization_id)
-		 crud.readDocumentList({
-			      collection: "organizations",
-			      operator: {
-							filters: [{
-								name: '_id',
-								operator: "$eq",
-								value: [org["_id"].toString()]
-							}],
-							orders: [],
-			  				startIndex: 0,
-			  				search: { type: 'or', value: []}
-			      },
-	         "event": "getDataOrg",
+		 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"],
-		    // securityKey: org["securityKey"],
-		    organization_id: org["_id"]
+		     organization_id: org["_id"]
 		});
-	    let myOrg = await crud.listenAsync("getDataOrg");
 	    let result = {'row':myOrg,'socket_config':socket_config};
 	    return result;
 	 }