@cocreate/socket-server 1.19.5 → 1.20.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [1.20.0](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.19.5...v1.20.0) (2023-10-19)
+
+
+### Bug Fixes
+
+* delete data.socket ([4fd38ff](https://github.com/CoCreate-app/CoCreate-socket-server/commit/4fd38ffd9989502955eb73d7d21f90102ea41e69))
+* improved error handling ([04be91f](https://github.com/CoCreate-app/CoCreate-socket-server/commit/04be91ffcc62c7270fc83cbb1c755125485496fb))
+
+
+### Features
+
+* delay user deletion for potential reconnect ([34e3a14](https://github.com/CoCreate-app/CoCreate-socket-server/commit/34e3a143776a0e67f8cea56ab2f0334a1e349df2))
+* If authinticated emit 'notification.user' ([ac4779f](https://github.com/CoCreate-app/CoCreate-socket-server/commit/ac4779f0773e5f9b906390648c536e654cc1f40a))
+
 ## [1.19.5](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.19.4...v1.19.5) (2023-10-16)
 
 

package/package.json

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

package/src/index.js

@@ -42,8 +42,6 @@ class SocketServer extends EventEmitter {
                         errors.error = organization.error
                         return socket.send(JSON.stringify({ method: 'Access Denied', error: errors }))
                     }
-                    // if (!organization)
-                    //     return socket.send(JSON.stringify({ method: 'Access Denied', error: organization.error }))
 
                     let options = decodeURIComponent(request.headers['sec-websocket-protocol'])
                     options = JSON.parse(options)
@@ -86,18 +84,19 @@ class SocketServer extends EventEmitter {
 
                     self.emit('read.object', data);
 
-                    if (self.authenticate && options.token) {
-                        let { user_id, expires } = self.authenticate.decodeToken(options.token)
-                        // self.authenticate.decodeToken(options.token).then(({ user_id, expires }) => {
+                    if (self.authenticate) {
+                        const { user_id, expires } = self.authenticate.decodeToken(options.token)
+
                         if (user_id) {
                             socket.user_id = user_id;
                             socket.expires = expires;
                             self.emit('userStatus', { socket, method: 'userStatus', user_id, userStatus: 'on', organization_id });
+                            self.emit("notification.user", socket)
                         } else
-                            self.emit('userStatus', { socket, user_id, status: 'off', organization_id });
+                            self.emit('userStatus', { socket, user_id: options.user_id, userStatus: 'off', organization_id });
 
                         self.onWebSocket(socket);
-                        // })
+
                     } else
                         self.onWebSocket(socket);
                 } else {
@@ -174,12 +173,13 @@ class SocketServer extends EventEmitter {
 
         if (socket.user_id) {
             this.emit('userStatus', { socket, user_id: socket.user_id, userStatus: 'on', organization_id });
+            let user = this.users.get(socket.user_id)
 
-            if (!this.users.has(socket.user_id)) {
+            if (!Array.isArray(user)) {
+                clearTimeout(user)
                 this.users.set(socket.user_id, [socket])
-            } else {
-                this.users.get(socket.user_id).push(socket)
-            }
+            } else
+                user.push(socket)
         }
 
     }
@@ -278,13 +278,22 @@ class SocketServer extends EventEmitter {
             if (socket.user_id) {
                 let sockets = this.users.get(socket.user_id)
                 if (sockets) {
-                    const index = sockets.findIndex(item => item.id === socket.id);
-                    if (index !== -1) {
-                        sockets.splice(index, 1);
-                    }
-                    if (!sockets.length) {
-                        this.users.delete(socket.user_id);
-                        this.emit('userStatus', { socket, user_id, status: 'off', organization_id });
+                    if (Array.isArray(sockets) && sockets.length) {
+                        const index = sockets.findIndex(item => item.id === socket.id);
+                        if (index !== -1) {
+                            sockets.splice(index, 1);
+                        }
+                    } else {
+                        let userDebounceTimer = sockets
+
+                        clearTimeout(userDebounceTimer);
+                        userDebounceTimer = setTimeout(() => {
+                            this.users.delete(socket.user_id);
+                            this.emit('userStatus', { socket, user_id: socket.user_id, userStatus: 'off', organization_id });
+                        }, 10000);
+
+                        this.users.set(socket.user_id, userDebounceTimer)
+
                     }
                 }
             }
@@ -301,12 +310,16 @@ class SocketServer extends EventEmitter {
                 organization_id
             });
 
-            const organization = this.organizations.get(organization_id)
-            if (organization && organization.organizationBalance == false)
-                return socket.send({ method: 'Access Denied', organizationBalance: false, error: organization.error })
 
             let data = JSON.parse(message)
             if (data.method) {
+                const organization = this.organizations.get(organization_id)
+                if (organization && organization.organizationBalance == false) {
+                    data.organizationBalance = false
+                    data.error = organization.error
+                    return socket.send(JSON.stringify(data))
+                }
+
                 if (data.method === 'region.added' || data.method === 'region.removed')
                     console.log('data.method: ', data.method)
 
@@ -317,8 +330,11 @@ class SocketServer extends EventEmitter {
 
                 if (this.authorize) {
                     if (!this.sockets.has(socket.id)) {
-                        if (organization && !organization.organizationBalance == false)
-                            return socket.send({ method: 'Access Denied', organizationBalance: false, error: organization.error })
+                        if (organization && organization.organizationBalance == false) {
+                            data.organizationBalance = false
+                            data.error = organization.error
+                            return socket.send(JSON.stringify(data))
+                        }
                     }
 
                     data.socket = socket
@@ -351,11 +367,12 @@ class SocketServer extends EventEmitter {
 
                     if (organization && organization.status === false) {
                         let errors = {}
-                        errors.serverOrganization = organization.serverOrganization
-                        errors.serverStorage = organization.serverStorage
-                        errors.organizationBalance = organization.organizationBalance
-                        errors.error = organization.error
-                        return socket.send(JSON.stringify({ method: 'Access Denied', ...errors }))
+                        data.serverOrganization = organization.serverOrganization
+                        data.serverStorage = organization.serverStorage
+                        data.organizationBalance = organization.organizationBalance
+                        data.error = organization.error
+                        delete data.socket
+                        return socket.send(JSON.stringify(data))
                     }
 
                     // dburl is true and db does not have 'keys' array