@cocreate/socket-server 1.10.0 → 1.10.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.10.2](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.10.1...v1.10.2) (2023-05-25)
+
+
+### Bug Fixes
+
+* Delete AsyncMessage.js as by design the results are async & refactor index.js Emitting; authorized data in send method ([b47e6fc](https://github.com/CoCreate-app/CoCreate-socket-server/commit/b47e6fc0386b4beb25eefba90e74f47e91f949f2))
+
+## [1.10.1](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.10.0...v1.10.1) (2023-05-25)
+
+
+### Bug Fixes
+
+* Update dependencies versions ([d3cad89](https://github.com/CoCreate-app/CoCreate-socket-server/commit/d3cad89ad28f8b90c89b9fd3f30acab59496a623))
+
 # [1.10.0](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.9.0...v1.10.0) (2023-05-25)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/socket-server",
-  "version": "1.10.0",
+  "version": "1.10.2",
   "description": "CoCreate-socket-server",
   "keywords": [
     "cocreate-socket",
@@ -40,8 +40,8 @@
   },
   "homepage": "https://cocreate.app/docs/CoCreate-socket-server",
   "dependencies": {
-    "@cocreate/docs": "^1.7.11",
-    "@cocreate/uuid": "^1.4.10"
+    "@cocreate/docs": "^1.7.13",
+    "@cocreate/uuid": "^1.4.11"
   },
   "devDependencies": {
     "express": "^4.17.1",

package/src/index.js

@@ -1,19 +1,13 @@
 const WebSocket = require('ws');
 const url = require("url");
 const EventEmitter = require("events").EventEmitter;
-const AsyncMessage = require("./AsyncMessage")
 const uid = require('@cocreate/uuid')
 
 class SocketServer extends EventEmitter {
     constructor(prefix) {
         super();
-
         this.clients = new Map();
-        this.asyncMessages = new Map();
-
         this.prefix = prefix || "crud";
-
-        //. websocket server
         this.wss = new WebSocket.Server({ noServer: true });
     }
 
@@ -63,12 +57,6 @@ class SocketServer extends EventEmitter {
             room_clients = [socket];
         }
         this.clients.set(key, room_clients);
-        // this.addAsyncMessage(key)
-
-        let asyncMessage = this.asyncMessages.get(key)
-        if (!asyncMessage) {
-            this.asyncMessages.set(key, new AsyncMessage(key));
-        }
 
         if (user_id)
             this.emit('userStatus', socket, { user_id, userStatus: 'on', organization_id });
@@ -99,10 +87,10 @@ class SocketServer extends EventEmitter {
             if (user_id)
                 this.emit('userStatus', socket, { user_id, status: 'off', organization_id });
 
+            // TODO: remove if no one else connected to organization
             this.emit("deleteMetrics", { organization_id });
             this.emit("deletePermissions", organization_id);
             this.emit('disconnect', organization_id)
-            this.asyncMessages.delete(key);
         } else {
             let total_cnt = 0;
             this.clients.forEach((c) => total_cnt += c.length)
@@ -167,16 +155,6 @@ class SocketServer extends EventEmitter {
                         this.send(socket, 'updateUserStatus', { userStatus: 'off', clientId: data.clientId, organization_id })
                     }
 
-                    //. checking async status....				
-                    if (data.async == true) {
-                        console.log('async true')
-                        const asyncMessage = this.asyncMessages.get(socket.config.key);
-                        socket.config.asyncId = uid.generate();
-                        if (asyncMessage) {
-                            asyncMessage.defineMessage(socket.config.asyncId);
-                        }
-                    }
-
                     this.emit(action, socket, data);
 
                 }
@@ -190,13 +168,6 @@ class SocketServer extends EventEmitter {
         if (!data.uid)
             data.uid = uid.generate()
 
-        const asyncId = socket.config.asyncId
-        let isAsync = false;
-        let asyncData = [];
-        if (asyncId && socket.config && socket.config.key) {
-            isAsync = true;
-        }
-
         let organization_id = socket.config.organization_id;
         let url = `/${this.prefix}/${organization_id}`;
 
@@ -214,72 +185,46 @@ class SocketServer extends EventEmitter {
                 let url = url;
                 url += `/${room}`;
 
-                this.send(socket, action, data, url, isAsync, asyncData)
+                this.send(socket, action, data, url)
             }
         } else {
-            this.send(socket, action, data, url, isAsync, asyncData)
+            this.send(socket, action, data, url)
         }
+    }
 
-        if (isAsync) {
-            this.asyncMessages.get(socket.config.key).setMessage(asyncId, asyncData)
-        }
+    async send(socket, action, data, url) {
+        let clients
+        if (!url)
+            clients = [socket]
+        else
+            clients = this.clients.get(url);
+
+        if (clients) {
+            for (let client of clients) {
+                if (socket != client && data.broadcast != false || socket == client && data.broadcastSender != false) {
+                    const permission = await this.authorize.check(action, data, socket.config.user_id)
+                    if (permission && permission.authorized)
+                        data = permission.authorized
 
-    }
+                    let responseData = JSON.stringify({
+                        action,
+                        data
+                    });
 
-    async send(socket, action, data, url, isAsync, asyncData) {
-        const asyncId = socket.config.asyncId
+                    socket.send(responseData);
 
-        if (!url && asyncId && socket.config && socket.config.key) {
-            let responseData = JSON.stringify({
-                action,
-                data
-            });
-            this.asyncMessages.get(socket.config.key).setMessage(asyncId, [{ socket, message: responseData }]);
-        } else {
-            let clients
-            if (!url)
-                clients = [socket]
-            else
-                clients = this.clients.get(url);
-
-            if (clients) {
-                for (let client of clients) {
-                    if (socket != client && data.broadcast != false || socket == client && data.broadcastSender != false) {
-                        if (isAsync) {
-                            asyncData.push({ socket, message: JSON.stringify({ action, data }) })
-                        } else {
-                            const permission = await this.authorize.check(action, data, socket.config.user_id)
-                            if (permission && permission.authorized)
-                                data = permission.authorized
-
-                            let responseData = JSON.stringify({
-                                action,
-                                data
-                            });
-
-                            socket.send(responseData);
-
-                            if (socket.config && socket.config.organization_id)
-                                this.emit("setBandwidth", {
-                                    type: 'out',
-                                    data: responseData,
-                                    organization_id: socket.config.organization_id
-                                })
-                        }
-                    }
+                    if (socket.config && socket.config.organization_id)
+                        this.emit("setBandwidth", {
+                            type: 'out',
+                            data: responseData,
+                            organization_id: socket.config.organization_id
+                        })
                 }
             }
         }
 
     }
 
-    // addAsyncMessage(key) {
-    // 	let asyncMessage = this.asyncMessages.get(key)
-    // 	if (!asyncMessage) {
-    // 		this.asyncMessages.set(key, new AsyncMessage(key));
-    // 	}
-    // }
-
     getKeyFromUrl(pathname) {
         var path = pathname.split("/");
         var params = {

package/src/AsyncMessage.js

@@ -1,52 +0,0 @@
-
-class AsyncMessage {
-	constructor(key) {
-		this.key = key;
-		this.messages = new Map();
-		this.orders = [];
-	}
-	
-	defineMessage(id) {
-		this.orders.push(id);
-		this.messages.set(id, null);
-	}
-	
-	setMessage(id, data) {
-		this.messages.set(id, data);
-		if (this.orders.length > 0) {
-			this.runMessage();
-		}
-		
-	}
-	
-	runMessage() {
-		let runIndex = -1;
-		this.orders.some((key, index) => {
-			let messageData = this.messages.get(key)
-			if (messageData != null) {
-				messageData.forEach(({socket, message}) => {
-					try {
-						if (socket) {
-							socket.send(message);
-						}
-					} catch (error) {
-						console.log(error);
-					}
-				})
-				
-				runIndex = index;
-				this.messages.delete(key);
-				return false;
-			} else {
-				return true;
-			}
-		})
-		
-		if (runIndex !== -1) {
-			this.orders.splice(0, runIndex + 1);
-		}
-		
-	}
-}
-
-module.exports = AsyncMessage;