@cocreate/socket-server 1.28.2 → 1.29.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [1.29.0](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.28.3...v1.29.0) (2024-03-18)
+
+
+### Features
+
+* get socket using socket.id to maintain a persitient socket connection wtih client tabs ([922a462](https://github.com/CoCreate-app/CoCreate-socket-server/commit/922a4629573751ca87e72fde46598bc340af419f))
+
+## [1.28.3](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.28.2...v1.28.3) (2024-02-18)
+
+
+### Bug Fixes
+
+* add host ([7542ee7](https://github.com/CoCreate-app/CoCreate-socket-server/commit/7542ee7cb28821515078a912e40574aa0c761b00))
+
 ## [1.28.2](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.28.1...v1.28.2) (2024-02-15)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/socket-server",
-  "version": "1.28.2",
+  "version": "1.29.0",
   "description": "CoCreate-socket-server",
   "keywords": [
     "cocreate-socket",

package/src/index.js

@@ -73,6 +73,7 @@ class SocketServer extends EventEmitter {
                     let data = {
                         socket,
                         method: 'object.read',
+                        host: socket.host,
                         array: 'message_log',
                         $filter: {
                             sort: [
@@ -95,7 +96,7 @@ class SocketServer extends EventEmitter {
 
                     if (self.authenticate) {
                         const { user_id, expires } = await self.authenticate.decodeToken(options.token, organization_id, options.clientId)
-                        const userStatus = { socket, method: 'userStatus', user_id: options.user_id, clientId: options.clientId, userStatus: 'off', organization_id }
+                        const userStatus = { socket, method: 'userStatus', host: socket.host, user_id: options.user_id, clientId: options.clientId, userStatus: 'off', organization_id }
                         if (user_id) {
                             options.user_id = user_id
                             socket.user_id = user_id;
@@ -170,53 +171,63 @@ class SocketServer extends EventEmitter {
 
 
         if (!this.clients.has(socket.clientId)) {
-            this.clients.set(socket.clientId, []);
+            this.clients.set(socket.clientId, {});
 
             if (!organization.clients)
-                organization.clients = { [socket.clientId]: [] }
+                organization.clients = { [socket.clientId]: {} }
             else
-                organization.clients[socket.clientId] = []
+                organization.clients[socket.clientId] = {}
         }
 
-        if (!this.sockets.has(socket.id)) {
-            this.sockets.set(socket.id, socket);
-            this.clients.get(socket.clientId).push(socket);
-            if (!organization.clients[socket.clientId])
-                organization.clients[socket.clientId] = [socket]
-            else
-                organization.clients[socket.clientId].push(socket)
-        }
+
+        this.sockets.set(socket.id, socket);
+        this.clients.get(socket.clientId)[socket.id] = socket
+        if (!organization.clients[socket.clientId])
+            organization.clients[socket.clientId] = { [socket.id]: socket }
+        else
+            organization.clients[socket.clientId][socket.id] = socket
 
         if (socket.user_id) {
-            this.emit('userStatus', { socket, user_id: socket.user_id, clientId: socket.clientId, userStatus: 'on', organization_id });
+            this.emit('userStatus', { socket, host: socket.host, user_id: socket.user_id, clientId: socket.clientId, userStatus: 'on', organization_id });
             let user = this.users.get(socket.user_id)
 
-            if (!Array.isArray(user)) {
+            if (!user) {
                 clearTimeout(user)
-                this.users.set(socket.user_id, [socket])
+                this.users.set(socket.user_id, { [socket.id]: socket })
             } else
-                user.push(socket)
+                user[socket.id] = socket
         }
 
     }
 
     get(data) {
-        let sockets = []
+        let sockets = [], clients
+        let organization = this.organizations.get(data.organization_id)
+        if (organization)
+            clients = organization.clients
+        else
+            return []
+
         if (data.broadcast !== false) {
-            let organization = this.organizations.get(data.organization_id)
-            if (organization) {
-                const clients = organization.clients
-                for (let client of Object.keys(clients)) {
-                    if (data.broadcastSender === false && client === data.clientId) continue
-
-                    if (data.broadcastClient)
-                        sockets.push(clients[client][0])
+            for (let client of Object.keys(clients)) {
+                if (data.broadcastSender === false && client === data.clientId) continue
+
+                if (data.broadcastClient) {
+                    if (client === data.clientId && clients[client][data.socket.id])
+                        sockets.push(clients[client][data.socket.id])
                     else
-                        sockets.push(...clients[client])
-                }
+                        sockets.push(Object.values(clients[client])[0])
+                } else
+                    sockets.push(...Array.from(Object.values(clients[client])))
             }
         } else if (data.broadcastSender !== false) {
-            sockets.push(data.socket)
+            if (clients[data.clientId]) {
+                if (clients[data.clientId][data.socket.id])
+                    sockets.push(clients[data.clientId][data.socket.id])
+                else
+                    sockets.push(Object.values(clients[data.clientId])[0])
+            } else
+                sockets.push(data.socket)
         }
         return sockets
     }
@@ -230,16 +241,20 @@ class SocketServer extends EventEmitter {
             // Check if the client exists
             if (clients && clients[socket.clientId]) {
                 const client = clients[socket.clientId]
+                delete client[socket.id]
+
+                if (!Object.keys(client).length)
+                    delete clients[socket.clientId];
 
                 // Check if the socket exists in the client's sockets
-                const index = client.findIndex(item => item.id === socket.id);
-                if (index !== -1) {
-                    client.splice(index, 1);
-                }
+                // const index = client.findIndex(item => item.id === socket.id);
+                // if (index !== -1) {
+                //     client.splice(index, 1);
+                // }
 
-                if (!client.length) {
-                    delete clients[socket.clientId];
-                }
+                // if (!client.length) {
+                //     delete clients[socket.clientId];
+                // }
 
                 if (!Object.keys(clients).length) {
                     this.organizations.delete(socket.organization_id);
@@ -264,14 +279,10 @@ class SocketServer extends EventEmitter {
 
         if (this.clients.has(socket.clientId)) {
             const client = this.clients.get(socket.clientId)
-            const index = client.findIndex(item => item.id === socket.id);
-            if (index !== -1) {
-                client.splice(index, 1);
-            }
+            delete client[socket.id]
 
-            if (!client.length) {
+            if (!Object.keys(client).length)
                 this.clients.delete(socket.clientId);
-            }
         }
 
         if (this.clients.size === 0) {
@@ -295,18 +306,14 @@ class SocketServer extends EventEmitter {
             if (socket.user_id) {
                 let sockets = this.users.get(socket.user_id)
                 if (sockets) {
-                    if (Array.isArray(sockets) && sockets.length) {
-                        const index = sockets.findIndex(item => item.id === socket.id);
-                        if (index !== -1) {
-                            sockets.splice(index, 1);
-                        }
-                    } else {
+                    delete sockets[socket.id]
+                    if (!Object.keys(sockets).length) {
                         let userDebounceTimer = sockets
 
                         clearTimeout(userDebounceTimer);
                         userDebounceTimer = setTimeout(() => {
                             this.users.delete(socket.user_id);
-                            this.emit('userStatus', { socket, user_id: socket.user_id, clientId: socket.clientId, userStatus: 'off', organization_id });
+                            this.emit('userStatus', { socket, user_id: socket.user_id, host: socket.host, clientId: socket.clientId, userStatus: 'off', organization_id });
                         }, 10000);
 
                         this.users.set(socket.user_id, userDebounceTimer)
@@ -356,7 +363,7 @@ class SocketServer extends EventEmitter {
                 // data.error = 'Token expired'
                 // socket.send(JSON.stringify(data))
                 await this.send({
-                    socket, method: 'updateUserStatus', user_id: socket.user_id, clientId: data.clientId, userStatus: 'off', socketId: data.socketId, organization_id
+                    socket, method: 'updateUserStatus', user_id: socket.user_id, host: socket.host, clientId: data.clientId, userStatus: 'off', socketId: data.socketId, organization_id
                 })
                 socket.user_id = socket.expires = null
                 return
@@ -493,6 +500,11 @@ class SocketServer extends EventEmitter {
                     Data = { ...data }
                 }
 
+                // TODO: the following code can cause issues in client and improved approach is to check if user has permission and send or dont send
+                if (Data.$filter && Data.$filter.query && Data.$filter.query._id && Data.$filter.query._id.$eq === '$user_id')
+                    delete Data.$filter.query._id
+
+
                 delete Data.socket
                 sockets[i].send(JSON.stringify(Data));