@cocreate/socket-server 1.4.14 → 1.4.16

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [1.4.16](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.4.15...v1.4.16) (2022-12-02)
+
+
+### Bug Fixes
+
+* add data.uid if does not exist ([8f82de8](https://github.com/CoCreate-app/CoCreate-socket-server/commit/8f82de806d8fe30f5c59abccfd5e5958a2c14018))
+* bump dependencies ([553a695](https://github.com/CoCreate-app/CoCreate-socket-server/commit/553a69586a368310d5b5e6e1f24b4871ae9c90b0))
+* renamed module to action ([9526e0c](https://github.com/CoCreate-app/CoCreate-socket-server/commit/9526e0c3cabfcabf8945615f978a060e690df09d))
+
+## [1.4.15](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.4.14...v1.4.15) (2022-11-28)
+
+
+### Bug Fixes
+
+* bump dependencies ([8740628](https://github.com/CoCreate-app/CoCreate-socket-server/commit/8740628f73b01d8b44192605dfb0d90ef37e886a))
+
 ## [1.4.14](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.4.13...v1.4.14) (2022-11-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/socket-server",
-  "version": "1.4.14",
+  "version": "1.4.16",
   "description": "CoCreate-socket-server",
   "keywords": [
     "cocreate-socket",
@@ -40,8 +40,8 @@
   },
   "homepage": "https://cocreate.app/docs/CoCreate-socket-server",
   "dependencies": {
-    "@cocreate/docs": "^1.4.7",
-    "@cocreate/uuid": "^1.2.28"
+    "@cocreate/docs": "^1.4.10",
+    "@cocreate/uuid": "^1.2.30"
   },
   "devDependencies": {
     "express": "^4.17.1",

package/src/index.js

@@ -2,7 +2,7 @@ const WebSocket = require('ws');
 const url = require("url");
 const EventEmitter = require("events").EventEmitter;
 const AsyncMessage = require("./AsyncMessage")
-const CoCreateUUID = require('@cocreate/uuid')
+const uid = require('@cocreate/uuid')
 
 class SocketServer extends EventEmitter{
 	constructor(prefix) {
@@ -135,7 +135,7 @@ class SocketServer extends EventEmitter{
 			
 			const requestData = JSON.parse(message)
 
-			if (requestData.module) {
+			if (requestData.action) {
 				let user_id = null;
 				if (this.authInstance) {
 					user_id = await this.authInstance.getUserId(req);
@@ -149,7 +149,7 @@ class SocketServer extends EventEmitter{
 
 				//. check permission
 				if (this.permissionInstance) {
-					let passStatus = await this.permissionInstance.check(requestData.module, requestData.data, req, user_id)
+					let passStatus = await this.permissionInstance.check(requestData.action, requestData.data, req, user_id)
 					if (!passStatus) {
 						this.send(socket, 'permissionError', requestData.data)
 						return;
@@ -159,14 +159,13 @@ class SocketServer extends EventEmitter{
 				//. checking async status....				
 				if (requestData.data.async == true) {
 					console.log('async true')
-					const uuid = CoCreateUUID.generate()
 					const asyncMessage = this.asyncMessages.get(socket.config.key);
-					socket.config.asyncId = uuid;
+					socket.config.asyncId = uid.generate();
 					if (asyncMessage) {
-						asyncMessage.defineMessage(uuid);
+						asyncMessage.defineMessage(socket.config.asyncId);
 					}
 				}
-				this.emit(requestData.module, socket, requestData.data);
+				this.emit(requestData.action, socket, requestData.data);
 			}
 			
 		} catch(e) {
@@ -174,10 +173,12 @@ class SocketServer extends EventEmitter{
 		}
 	}
 	
-	broadcast(socket, messageName, data) {
+	broadcast(socket, action, data) {
 		const self = this;
+		if (!data.uid)
+			data.uid = uid.generate()
 		const responseData = JSON.stringify({
-			module: messageName,
+			action,
 			data
 		});
 
@@ -243,10 +244,10 @@ class SocketServer extends EventEmitter{
 		
 	}
 	
-	send(socket, messageName, data){
+	send(socket, action, data){
 		const asyncId = socket.config.asyncId
 		let responseData = JSON.stringify({
-			module: messageName,
+			action,
 			data
 		});