@cocreate/socket-server 1.21.11 → 1.23.0

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [1.23.0](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.22.0...v1.23.0) (2023-11-25)
+
+
+### Bug Fixes
+
+* userStatus across various clientid ([507d5e5](https://github.com/CoCreate-app/CoCreate-socket-server/commit/507d5e5b7e17a6aadb6b1b4522b8f753d0156715))
+
+
+### Features
+
+* upgrade dependencies for latest features and fixes ([5176e69](https://github.com/CoCreate-app/CoCreate-socket-server/commit/5176e69558a57af55d003608fb24515103877edd))
+
+# [1.22.0](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.21.11...v1.22.0) (2023-11-19)
+
+
+### Features
+
+* update dependecies for th latest features and bug fixes ([6da29d2](https://github.com/CoCreate-app/CoCreate-socket-server/commit/6da29d232c85a774af066838141a8b399ae21ba1))
+
 ## [1.21.11](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.21.10...v1.21.11) (2023-11-16)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/socket-server",
-  "version": "1.21.11",
+  "version": "1.23.0",
   "description": "CoCreate-socket-server",
   "keywords": [
     "cocreate-socket",
@@ -40,9 +40,9 @@
   },
   "homepage": "https://cocreate.app/docs/CoCreate-socket-server",
   "dependencies": {
-    "@cocreate/config": "^1.6.8",
-    "@cocreate/uuid": "^1.7.4",
-    "@cocreate/utils": "^1.27.1",
+    "@cocreate/config": "^1.7.0",
+    "@cocreate/uuid": "^1.8.0",
+    "@cocreate/utils": "^1.28.0",
     "ws": "7.5.9"
   }
 }

package/src/index.js

@@ -88,7 +88,7 @@ class SocketServer extends EventEmitter {
 
                         if (self.authenticate) {
                             const { user_id, expires } = self.authenticate.decodeToken(options.token)
-                            const userStatus = { socket, method: 'userStatus', user_id: options.user_id, userStatus: 'off', organization_id }
+                            const userStatus = { socket, method: 'userStatus', 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;
@@ -181,7 +181,7 @@ class SocketServer extends EventEmitter {
         }
 
         if (socket.user_id) {
-            this.emit('userStatus', { socket, user_id: socket.user_id, userStatus: 'on', organization_id });
+            this.emit('userStatus', { socket, user_id: socket.user_id, clientId: socket.clientId, userStatus: 'on', organization_id });
             let user = this.users.get(socket.user_id)
 
             if (!Array.isArray(user)) {
@@ -298,7 +298,7 @@ class SocketServer extends EventEmitter {
                         clearTimeout(userDebounceTimer);
                         userDebounceTimer = setTimeout(() => {
                             this.users.delete(socket.user_id);
-                            this.emit('userStatus', { socket, user_id: socket.user_id, userStatus: 'off', organization_id });
+                            this.emit('userStatus', { socket, user_id: socket.user_id, clientId: socket.clientId, userStatus: 'off', organization_id });
                         }, 10000);
 
                         this.users.set(socket.user_id, userDebounceTimer)
@@ -333,8 +333,13 @@ class SocketServer extends EventEmitter {
                     console.log('data.method: ', data.method)
 
                 if (socket.user_id && socket.expires && new Date(new Date().toISOString()).getTime() >= socket.expires) {
+                    // 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.user_id = socket.expires = null
-                    this.send({ socket, method: 'updateUserStatus', userStatus: 'off', socketId: data.socketId, organization_id })
+                    return
                 }
 
                 if (this.authorize) {