@cocreate/socket-server 1.28.2 → 1.28.3

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [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.28.3",
   "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;
@@ -188,7 +189,7 @@ class SocketServer extends EventEmitter {
         }
 
         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)) {
@@ -306,7 +307,7 @@ class SocketServer extends EventEmitter {
                         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 +357,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 +494,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));