@cocreate/socket-server 1.19.4 → 1.20.0

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [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)
+
+
+### Bug Fixes
+
+* improved error handling ([a3e5d31](https://github.com/CoCreate-app/CoCreate-socket-server/commit/a3e5d314143f135816de7b51696626c53e6a88f0))
+
 ## [1.19.4](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.19.3...v1.19.4) (2023-10-14)
 
 

package/package.json

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

package/src/index.js

@@ -31,8 +31,18 @@ class SocketServer extends EventEmitter {
             let organization_id = request.url.split('/')
             organization_id = organization_id[organization_id.length - 1]
 
-            if (organization_id) {
-                this.wss.handleUpgrade(request, socket, head, function (socket) {
+            this.wss.handleUpgrade(request, socket, head, function (socket) {
+                if (organization_id) {
+                    let organization = self.organizations.get(organization_id)
+                    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', error: errors }))
+                    }
+
                     let options = decodeURIComponent(request.headers['sec-websocket-protocol'])
                     options = JSON.parse(options)
 
@@ -74,23 +84,25 @@ 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
+
+                    } else
                         self.onWebSocket(socket);
-                })
-            }
+                } else {
+                    socket.send(JSON.stringify({ method: 'Access Denied', error: 'An organization_id is required' }))
+                }
+            })
         });
     }
 
@@ -140,11 +152,17 @@ class SocketServer extends EventEmitter {
                 organization_id
             });
 
-        }
+        } else
+            clearTimeout(organization.debounce);
+
 
         if (!this.clients.has(socket.clientId)) {
             this.clients.set(socket.clientId, []);
-            organization.clients[socket.clientId] = []
+
+            if (!organization.clients)
+                organization.clients = { [socket.clientId]: [] }
+            else
+                organization.clients[socket.clientId] = []
         }
 
         if (!this.sockets.has(socket.id)) {
@@ -155,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)
         }
 
     }
@@ -179,9 +198,6 @@ class SocketServer extends EventEmitter {
                     else
                         sockets.push(...clients[client])
                 }
-            } else {
-                // TODO: requires a messageQueue that expires
-                console.log('organization could not be found', data)
             }
         } else if (data.broadcastSender !== false) {
             sockets.push(data.socket)
@@ -192,8 +208,9 @@ class SocketServer extends EventEmitter {
     delete(socket) {
         let organization_id = socket.organization_id
         if (this.organizations.has(organization_id)) {
-            const clients = this.organizations.get(organization_id).clients;
-
+            let clients = this.organizations.get(organization_id)
+            if (clients)
+                clients.clients;
             // Check if the client exists
             if (clients && clients[socket.clientId]) {
                 const client = clients[socket.clientId]
@@ -241,21 +258,43 @@ class SocketServer extends EventEmitter {
         }
 
         if (this.clients.size === 0) {
-            this.organizations.delete(socket.organization_id);
-        }
+            let organization = this.organizations.get(socket.organization_id)
+            let debounceTimer
+            if (organization)
+                debounceTimer = organization.debounce
+
+            clearTimeout(debounceTimer);
+            debounceTimer = setTimeout(() => {
+                this.organizations.delete(socket.organization_id);
+            }, 10000);
+
+            if (!organization)
+                this.organizations.set(socket.organization_id, { debounce: debounceTimer })
+            else
+                organization.debounce = debounceTimer
+
+            this.sockets.delete(socket.id);
+
+            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 {
+                        let userDebounceTimer = sockets
 
-        this.sockets.delete(socket.id);
+                        clearTimeout(userDebounceTimer);
+                        userDebounceTimer = setTimeout(() => {
+                            this.users.delete(socket.user_id);
+                            this.emit('userStatus', { socket, user_id: socket.user_id, userStatus: 'off', organization_id });
+                        }, 10000);
 
-        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 });
+                        this.users.set(socket.user_id, userDebounceTimer)
+
+                    }
                 }
             }
         }
@@ -271,11 +310,16 @@ class SocketServer extends EventEmitter {
                 organization_id
             });
 
-            if (this.organizations.has(organization_id) && !this.organizations.get(organization_id).status)
-                return this.send({ socket, method: 'Access Denied', balance: 'Your balance has fallen bellow 0' })
 
             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)
 
@@ -286,24 +330,51 @@ class SocketServer extends EventEmitter {
 
                 if (this.authorize) {
                     if (!this.sockets.has(socket.id)) {
-                        if (!this.organizations.get(organization_id).status)
-                            return this.send({ socket, method: 'Access Denied', balance: 'Your balance has fallen bellow 0' })
+                        if (organization && organization.organizationBalance == false) {
+                            data.organizationBalance = false
+                            data.error = organization.error
+                            return socket.send(JSON.stringify(data))
+                        }
                     }
 
                     data.socket = socket
 
                     const authorized = await this.authorize.check(data, socket.user_id)
-                    if (authorized.storage === false) {
+                    let errors = {}
+                    if (authorized.serverOrganization === false) {
+                        organization.status = errors.status = false;
+                        organization.serverOrganization = false;
+                        organization.error = authorized.error
+                    } else if (authorized.serverStorage === false) {
                         data.database = process.env.organization_id
                         data.organization_id = process.env.organization_id
 
                         const authorized2 = await this.authorize.check(data, req, socket.user_id)
                         if (!authorized2 || authorized2.error) {
-                            return this.send({ socket, method: 'Access Denied', authorized2, ...data })
+                            organization.status = errors.status = false;
+                            organization.error = errors.error = authorized.error
+                            if (authorized2.serverOrganization === false) {
+                                organization.serverOrganization = false;
+                            }
+                            if (authorized2.serverStorage === false) {
+                                organization.serverStorage = false;
+                            }
                         }
-                    } else if (!authorized || authorized.error) {
-                        return this.send({ socket, method: 'Access Denied', authorized, ...data })
+                    } else if (authorized.error) {
+                        organization.status = false;
+                        organization.error = authorized.error
                     }
+
+                    if (organization && organization.status === false) {
+                        let 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
                     // action: syncCollection data{array: 'keys', object[]}
                     // actions: add keys as once keys are added admin user can do anything