@cocreate/socket-server 1.8.0 → 1.8.2

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [1.8.2](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.8.1...v1.8.2) (2023-05-21)
+
+
+### Bug Fixes
+
+* Refactor socket server to track and limit server bandwidth usage. ([0c4c0f4](https://github.com/CoCreate-app/CoCreate-socket-server/commit/0c4c0f438a27e75d659044bfdcc19f422df67347))
+
+## [1.8.1](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.8.0...v1.8.1) (2023-05-20)
+
+
+### Bug Fixes
+
+* Refactor socket server code to re check permissions using platformId when organization.dbUrl is false. ([e0cae7a](https://github.com/CoCreate-app/CoCreate-socket-server/commit/e0cae7a0a2eb9c740f36a3306fc038a9c68329ab))
+* updated dependencies to their latest versions ([84d2f1d](https://github.com/CoCreate-app/CoCreate-socket-server/commit/84d2f1d0a67b021682f5b9b543ededb995830231))
+
 # [1.8.0](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.7.7...v1.8.0) (2023-05-19)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/socket-server",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "CoCreate-socket-server",
   "keywords": [
     "cocreate-socket",
@@ -40,8 +40,8 @@
   },
   "homepage": "https://cocreate.app/docs/CoCreate-socket-server",
   "dependencies": {
-    "@cocreate/docs": "^1.5.13",
-    "@cocreate/uuid": "^1.2.61"
+    "@cocreate/docs": "^1.7.11",
+    "@cocreate/uuid": "^1.4.10"
   },
   "devDependencies": {
     "express": "^4.17.1",

package/src/index.js

@@ -87,7 +87,7 @@ class SocketServer extends EventEmitter {
         let total_cnt = 0;
         this.clients.forEach((c) => total_cnt += c.length)
 
-        this.emit("createMetrics", null, {
+        this.emit("createMetrics", {
             organization_id,
             client_cnt: room_clients.length,
             total_cnt: total_cnt
@@ -109,7 +109,7 @@ class SocketServer extends EventEmitter {
             if (user_id)
                 this.emit('userStatus', socket, { user_id, status: 'off', organization_id });
 
-            this.emit("deleteMetrics", null, { organization_id });
+            this.emit("deleteMetrics", { organization_id });
             this.emit("deletePermissions", organization_id);
             this.emit('disconnect', organization_id)
             this.asyncMessages.delete(key);
@@ -117,7 +117,7 @@ class SocketServer extends EventEmitter {
             let total_cnt = 0;
             this.clients.forEach((c) => total_cnt += c.length)
 
-            this.emit("changeCountMetrics", null, {
+            this.emit("changeCountMetrics", {
                 organization_id,
                 total_cnt,
                 client_cnt: room_clients.length
@@ -129,19 +129,14 @@ class SocketServer extends EventEmitter {
     async onMessage(req, socket, message) {
         try {
             const organization_id = socket.config.organization_id
-
-            // TODO: remove
-            // if (message instanceof Buffer) {
-            // 	this.emit('importFile2DB', socket, message);
-            // 	console.log('importFile2DB', socket, message);
-            // 	return;
-            // }
-
             const { action, data } = JSON.parse(message)
 
             if (action) {
-                this.recordTransfer('in', message, organization_id)
-
+                this.emit("setBandwidth", {
+                    type: 'in',
+                    data: message,
+                    organization_id
+                });
                 let user_id = null;
                 if (this.authInstance)
                     user_id = await this.authInstance.getUserId(req);
@@ -149,57 +144,47 @@ class SocketServer extends EventEmitter {
                 if (this.permissionInstance) {
                     const permission = await this.permissionInstance.check(action, data, req, user_id)
                     if (!permission || permission.error) {
-                        // if (action == 'syncServer' && permission.database === true)
-                        // if (action == 'syncServer')
-                        // 	this.emit('createDocument', socket, data);
-                        // else
-                        if (user_id && permission.dbUrl === false && action.includes('Document') && (data.collection == 'organizations' || data.collection == 'users')) {
+                        if (permission.dbUrl === false) {
                             data.database = process.env.organization_id
                             data.organization_id = process.env.organization_id
-                            if (data.document) {
-                                if (Array.isArray(data.document) && data.document[0])
-                                    data.document = data.document[0]
-
-                                if (data.collection == 'organizations' && data.document._id !== socket.config.organization_id)
-                                    return this.send(socket, 'Access Denied', { action, permission, ...data })
-                                else if (data.collection == 'users' && data.document._id !== user_id)
-                                    return this.send(socket, 'Access Denied', { action, permission, ...data })
+
+                            const permission2 = await this.permissionInstance.check(action, data, req, user_id)
+                            if (!permission2 || permission2.error) {
+                                return this.send(socket, 'Access Denied', { action, permission2, ...data })
                             }
-                            delete data.filter
-                            delete data.document.organization_id
-                            if (action == 'updateDocument')
-                                data.upsert = false
-                        } else if (action === 'createOrganization' || action === 'signIn') {
-                            data.database = process.env.organization_id
-                            data.organization_id = process.env.organization_id
-                        } else {
+                        } else if (!user_id) {
                             return this.send(socket, 'Access Denied', { action, permission, ...data })
                         }
+                        // dburl is true and db does not have 'keys' collection
+                        // action: syncCollection data{collection: 'keys', document[]}
+                        // actions: add keys as once keys are added admin user can do anything
+
+
                     }
-                }
 
-                if (user_id) {
-                    if (!socket.config.user_id) {
-                        socket.config.user_id = user_id
-                        this.emit('userStatus', socket, { user_id, userStatus: 'on', organization_id });
+                    if (user_id) {
+                        if (!socket.config.user_id) {
+                            socket.config.user_id = user_id
+                            this.emit('userStatus', socket, { user_id, userStatus: 'on', organization_id });
+                        }
+                    } else {
+                        this.send(socket, 'updateUserStatus', { userStatus: 'off', clientId: data.clientId, organization_id })
                     }
-                } else {
-                    this.send(socket, 'updateUserStatus', { userStatus: 'off', clientId: data.clientId, organization_id })
-                }
 
-                //. checking async status....				
-                if (data.async == true) {
-                    console.log('async true')
-                    const asyncMessage = this.asyncMessages.get(socket.config.key);
-                    socket.config.asyncId = uid.generate();
-                    if (asyncMessage) {
-                        asyncMessage.defineMessage(socket.config.asyncId);
+                    //. checking async status....				
+                    if (data.async == true) {
+                        console.log('async true')
+                        const asyncMessage = this.asyncMessages.get(socket.config.key);
+                        socket.config.asyncId = uid.generate();
+                        if (asyncMessage) {
+                            asyncMessage.defineMessage(socket.config.asyncId);
+                        }
                     }
-                }
 
-                this.emit(action, socket, data);
-            }
+                    this.emit(action, socket, data);
 
+                }
+            }
         } catch (e) {
             console.log(e);
         }
@@ -244,9 +229,14 @@ class SocketServer extends EventEmitter {
                             if (isAsync) {
                                 asyncData.push({ socket: client, message: responseData })
                             } else {
+                                // TODO: check permission and remove any items client does not have a permission
                                 client.send(responseData);
                             }
-                            self.recordTransfer('out', responseData, organization_id)
+                            this.emit("setBandwidth", {
+                                type: 'out',
+                                data: responseData,
+                                organization_id
+                            })
                         }
                     })
                 }
@@ -260,9 +250,15 @@ class SocketServer extends EventEmitter {
                             if (isAsync) {
                                 asyncData.push({ socket: client, message: responseData })
                             } else {
+                                // TODO: check permission and remove any items client does not have a permission
                                 client.send(responseData);
                             }
-                            self.recordTransfer('out', responseData, organization_id)
+                            this.emit("setBandwidth", {
+                                type: 'out',
+                                data: responseData,
+                                organization_id
+                            })
+
                         }
                     })
                 }
@@ -286,12 +282,16 @@ class SocketServer extends EventEmitter {
         if (asyncId && socket.config && socket.config.key) {
             this.asyncMessages.get(socket.config.key).setMessage(asyncId, [{ socket, message: responseData }]);
         } else {
+            // TODO: check permission and remove any items client does not have a permission
             socket.send(responseData);
         }
 
         if (socket.config && socket.config.organization_id)
-            this.recordTransfer('out', responseData, socket.config.organization_id)
-
+            this.emit("setBandwidth", {
+                type: 'out',
+                data: responseData,
+                organization_id: socket.config.organization_id
+            })
     }
 
     // addAsyncMessage(key) {
@@ -313,20 +313,6 @@ class SocketServer extends EventEmitter {
         }
         return params
     }
-
-
-    sendBinary(socket, data, organization_id) {
-        socket.send(data, { binary: true });
-        this.recordTransfer('out', data, organization_id)
-    }
-
-    recordTransfer(type, data, organization_id) {
-        this.emit("setBandwidth", null, {
-            type,
-            data,
-            organization_id
-        });
-    }
 }