@cocreate/socket-server 1.18.0 → 1.18.1

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [1.18.1](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.18.0...v1.18.1) (2023-09-18)
+
+
+### Bug Fixes
+
+*  Add path and pathname ([5b5fb7e](https://github.com/CoCreate-app/CoCreate-socket-server/commit/5b5fb7e6d718f916dfdbfc3754cb63c6b1a51c47))
+* Update clients array to use map for improved management of each client ([cff2f2a](https://github.com/CoCreate-app/CoCreate-socket-server/commit/cff2f2ad3d34ac1d7b926180da508c65e5855b37))
+* Update dCoCreate dpendencies to latest versions ([03fa429](https://github.com/CoCreate-app/CoCreate-socket-server/commit/03fa429efc31db9f0ed5aec41dbf5b471475e0ba))
+
 # [1.18.0](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.17.0...v1.18.0) (2023-09-17)
 
 

package/CoCreate.config.js

@@ -1,24 +1,24 @@
-module.exports = {
-    "organization_id": "",
-    "key": "",
-    "host": "",
-    "sources": [
-        {
-            "array": "files",
-            "object": {
-                "_id": "6204254580b409001727b744",
-                "name": "index.html",
-                "path": "/docs/socket-server/index.html",
-                "src": "{{./docs/index.html}}",
-                "host": [
-                    "*",
-                    "general.cocreate.app"
-                ],
-                "directory": "/docs/socket-server",
-                "content-type": "text/html",
-                "public": "true",
-                "website_id": "5ffbceb7f11d2d00103c4535"
-            }
-        }
-    ]
-}
+module.exports = {
+    "organization_id": "",
+    "key": "",
+    "host": "",
+    "sources": [
+        {
+            "array": "files",
+            "object": {
+                "_id": "6204254580b409001727b744",
+                "name": "index.html",
+                "path": "/docs/socket-server",
+                "pathname": "/docs/socket-server/index.html",
+                "src": "{{./docs/index.html}}",
+                "host": [
+                    "*",
+                    "general.cocreate.app"
+                ],
+                "directory": "socket-server",
+                "content-type": "text/html",
+                "public": "true"
+            }
+        }
+    ]
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/socket-server",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "CoCreate-socket-server",
   "keywords": [
     "cocreate-socket",
@@ -40,8 +40,8 @@
   },
   "homepage": "https://cocreate.app/docs/CoCreate-socket-server",
   "dependencies": {
-    "@cocreate/config": "^1.5.0",
-    "@cocreate/uuid": "^1.7.0",
+    "@cocreate/config": "^1.5.1",
+    "@cocreate/uuid": "^1.7.1",
     "ws": "7.5.9"
   }
 }

package/src/index.js

@@ -68,13 +68,14 @@ class SocketServer extends EventEmitter {
         let user_id = socket.config.user_id
         let key = socket.config.key
         let clients = this.clients.get(key);
-        if (clients) {
-            clients.push(socket);
-        } else {
-            clients = [socket];
+        if (!clients) {
+            clients = new Map();
+            this.clients.set(key, clients);
         }
-        this.clients.set(key, clients);
-
+        if (!clients.has(socket))
+            clients.set(socket, true);
+        else
+            console.log('has client')
         if (user_id)
             this.emit('userStatus', socket, { socket, user_id, userStatus: 'on', organization_id });
     }
@@ -83,18 +84,15 @@ class SocketServer extends EventEmitter {
         let organization_id = socket.config.organization_id
         let user_id = socket.config.user_id
         let key = socket.config.key
-        let clients = this.clients.get(key)
-        const index = clients.indexOf(socket);
-
-        if (index > -1) {
-            clients.splice(index, 1);
-        }
+        let clients = this.clients.get(key);
+        clients.delete(socket);
 
         if (user_id)
             this.emit('userStatus', socket, { socket, user_id, status: 'off', organization_id });
 
-        if (clients.length == 0) {
+        if (clients.size == 0) {
             this.organizations.delete(organization_id)
+            // this.clients.delete(key);
             this.emit('disconnect', organization_id)
         }
 
@@ -138,7 +136,7 @@ class SocketServer extends EventEmitter {
                         if (!user_id)
                             this.send({ socket, method: 'updateUserStatus', userStatus: 'off', clientId: data.clientId, organization_id })
 
-                        return this.send({ method: 'Access Denied', authorized, ...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[]}
@@ -172,7 +170,7 @@ class SocketServer extends EventEmitter {
         if (!data.uid)
             data.uid = uid.generate()
 
-        let organization_id = socket.config.organization_id;
+        let organization_id = data.socket.config.organization_id;
         let url = `/${this.prefix}/${organization_id}`;
 
         let namespace = data.namespace;
@@ -202,12 +200,12 @@ class SocketServer extends EventEmitter {
 
         let clients
         if (!url)
-            clients = [socket]
+            clients = new Map([[socket, true]])
         else
             clients = this.clients.get(url);
 
         if (clients) {
-            for (let client of clients) {
+            for (let client of clients.keys()) {
                 if (socket != client && data.broadcast != false || socket == client && data.broadcastSender != false) {
                     const authorized = await this.authorize.check(data, socket.config.user_id)
                     if (authorized && authorized.authorized)