@cocreate/socket-server 1.16.2 → 1.17.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [1.17.0](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.16.3...v1.17.0) (2023-09-07)
+
+
+### Features
+
+* organzations map to store the orgs active status, if the org balance falls bellow 0 false is set resulting in socket and file-server responding with 0 balance  error message ([e06b8b1](https://github.com/CoCreate-app/CoCreate-socket-server/commit/e06b8b173fc24b98b60a9bd24494bb1fceea19cc))
+
+## [1.16.3](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.16.2...v1.16.3) (2023-08-21)
+
+
+### Bug Fixes
+
+* update permission functions and variable to authorize for improved clarity and readability ([19c7415](https://github.com/CoCreate-app/CoCreate-socket-server/commit/19c74155e696886f3daab672489febf6009c2e1a))
+
 ## [1.16.2](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.16.1...v1.16.2) (2023-08-21)
 
 

package/package.json

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

package/src/index.js

@@ -1,5 +1,5 @@
 const WebSocket = require('ws');
-const url = require("url");
+const { URL } = require("url");
 const EventEmitter = require("events").EventEmitter;
 const uid = require('@cocreate/uuid')
 const config = require('@cocreate/config')
@@ -7,8 +7,9 @@ const config = require('@cocreate/config')
 class SocketServer extends EventEmitter {
     constructor(server, prefix) {
         super();
+        this.organizations = new Map();
         this.clients = new Map();
-        this.prefix = prefix || "crud";
+        this.prefix = prefix || "ws";
         config({ organization_id: { prompt: 'Enter your organization_id: ' } })
 
         this.wss = new WebSocket.Server({ noServer: true });
@@ -25,10 +26,11 @@ class SocketServer extends EventEmitter {
 
     handleUpgrade(req, socket, head) {
         const self = this;
-        const pathname = url.parse(req.url).pathname;
-        const config = this.getKeyFromUrl(pathname)
+        // const url = new URL(req.url);
+        // const pathname = req.url;
+        const config = this.getKeyFromUrl(req.url)
         if (config.type == this.prefix) {
-            self.wss.handleUpgrade(req, socket, head, function (socket) {
+            this.wss.handleUpgrade(req, socket, head, function (socket) {
                 socket.config = config
                 self.onWebSocket(req, socket);
             })
@@ -60,6 +62,9 @@ class SocketServer extends EventEmitter {
 
     addClient(socket) {
         let organization_id = socket.config.organization_id
+        if (!this.organizations.has(organization_id))
+            this.organizations.set(organization_id, true)
+
         let user_id = socket.config.user_id
         let key = socket.config.key
         let clients = this.clients.get(key);
@@ -72,11 +77,6 @@ class SocketServer extends EventEmitter {
 
         if (user_id)
             this.emit('userStatus', socket, { user_id, userStatus: 'on', organization_id });
-
-        this.emit("createMetrics", {
-            organization_id,
-            clients: clients.length,
-        });
     }
 
     removeClient(socket) {
@@ -90,19 +90,12 @@ class SocketServer extends EventEmitter {
             clients.splice(index, 1);
         }
 
-        if (clients.length == 0) {
-            if (user_id)
-                this.emit('userStatus', socket, { user_id, status: 'off', organization_id });
+        if (user_id)
+            this.emit('userStatus', socket, { user_id, status: 'off', organization_id });
 
-            // TODO: remove if no one else connected to organization
-            this.emit("deleteMetrics", { organization_id });
-            this.emit("deletePermissions", organization_id);
+        if (clients.length == 0) {
+            this.organizations.delete(organization_id)
             this.emit('disconnect', organization_id)
-        } else {
-            this.emit("updateMetrics", {
-                organization_id,
-                clients: clients.length
-            });
         }
 
     }
@@ -110,34 +103,40 @@ class SocketServer extends EventEmitter {
     async onMessage(req, socket, message) {
         try {
             const organization_id = socket.config.organization_id
+
+            this.emit("setBandwidth", {
+                type: 'in',
+                data: message,
+                organization_id
+            });
+
+            let active = this.organizations.get(organization_id)
+            if (active === false)
+                return this.send(socket, { method: 'Access Denied', balance: 'Your balance has fallen bellow 0' })
+
             let data = JSON.parse(message)
 
             if (data.method) {
-                this.emit("setBandwidth", {
-                    type: 'in',
-                    data: message,
-                    organization_id
-                });
                 let user_id = null;
                 if (this.authenticate)
                     user_id = await this.authenticate.decodeToken(req);
 
                 if (this.authorize) {
                     data.host = this.getHost(req)
-                    const permission = await this.authorize.check(data, user_id)
-                    if (permission.storage === false) {
+                    const authorized = await this.authorize.check(data, user_id)
+                    if (authorized.storage === false) {
                         data.database = process.env.organization_id
                         data.organization_id = process.env.organization_id
 
-                        const permission2 = await this.authorize.check(data, req, user_id)
-                        if (!permission2 || permission2.error) {
-                            return this.send(socket, { method: 'Access Denied', permission2, ...data })
+                        const authorized2 = await this.authorize.check(data, req, user_id)
+                        if (!authorized2 || authorized2.error) {
+                            return this.send(socket, { method: 'Access Denied', authorized2, ...data })
                         }
-                    } else if (!permission || permission.error) {
+                    } else if (!authorized || authorized.error) {
                         if (!user_id)
                             this.send(socket, { method: 'updateUserStatus', userStatus: 'off', clientId: data.clientId, organization_id })
 
-                        return this.send(socket, { method: 'Access Denied', permission, ...data })
+                        return this.send(socket, { method: 'Access Denied', authorized, ...data })
                     }
                     // dburl is true and db does not have 'keys' array
                     // action: syncCollection data{array: 'keys', object[]}
@@ -146,8 +145,8 @@ class SocketServer extends EventEmitter {
 
                     // }
 
-                    if (permission.authorized)
-                        data = permission.authorized
+                    if (authorized.authorized)
+                        data = authorized.authorized
 
                     if (user_id) {
                         if (!socket.config.user_id) {
@@ -205,9 +204,9 @@ class SocketServer extends EventEmitter {
         if (clients) {
             for (let client of clients) {
                 if (socket != client && data.broadcast != false || socket == client && data.broadcastSender != false) {
-                    const permission = await this.authorize.check(data, socket.config.user_id)
-                    if (permission && permission.authorized)
-                        data = permission.authorized
+                    const authorized = await this.authorize.check(data, socket.config.user_id)
+                    if (authorized && authorized.authorized)
+                        data = authorized.authorized
 
                     let responseData = JSON.stringify(data);
 
@@ -239,13 +238,14 @@ class SocketServer extends EventEmitter {
     }
 
     getHost(req) {
-        const headers = req['headers']
-        let origin = headers['origin'];
-        if (origin && origin !== 'null')
-            return url.parse(origin).hostname;
+        if (req.headers.origin && req.headers.origin !== 'null') {
+            const url = new URL(req.headers.origin);
+            return url.host;
+        } else if (req.headers.host && req.headers.host !== 'null') {
+            return req.headers.host;
+        }
     }
 
 }
 
-
 module.exports = SocketServer