@cocreate/socket-server 1.21.4 → 1.21.6

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [1.21.6](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.21.5...v1.21.6) (2023-11-03)
+
+
+### Bug Fixes
+
+*  authorized false condition ([056e59a](https://github.com/CoCreate-app/CoCreate-socket-server/commit/056e59a41558f3a4a4450aa84ef8043ee1e5922b))
+* $addToSet.activeHost ([d705f16](https://github.com/CoCreate-app/CoCreate-socket-server/commit/d705f16ab7bef6bf6c0fe2f5f4d9416b1d9df463))
+* update dependencies to the lates versions ([6260248](https://github.com/CoCreate-app/CoCreate-socket-server/commit/62602485421b432ad00ca25712b3798c3a97eeef))
+* update method to use object.update etc ([10e4530](https://github.com/CoCreate-app/CoCreate-socket-server/commit/10e4530ea792e7e71bdf79a1c965e94bf2204edf))
+
+## [1.21.5](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.21.4...v1.21.5) (2023-10-26)
+
+
+### Bug Fixes
+
+* disabled message_log ([0977880](https://github.com/CoCreate-app/CoCreate-socket-server/commit/09778807aeaf9b7d574d956e0327d3277554ea19))
+
 ## [1.21.4](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.21.3...v1.21.4) (2023-10-25)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/socket-server",
-  "version": "1.21.4",
+  "version": "1.21.6",
   "description": "CoCreate-socket-server",
   "keywords": [
     "cocreate-socket",
@@ -40,9 +40,9 @@
   },
   "homepage": "https://cocreate.app/docs/CoCreate-socket-server",
   "dependencies": {
-    "@cocreate/config": "^1.6.5",
+    "@cocreate/config": "^1.6.6",
     "@cocreate/uuid": "^1.7.2",
-    "@cocreate/utils": "^1.26.1",
+    "@cocreate/utils": "^1.26.2",
     "ws": "7.5.9"
   }
 }

package/src/index.js

@@ -64,7 +64,7 @@ class SocketServer extends EventEmitter {
                     if (!organization || organization && organization.status !== false) {
                         let data = {
                             socket,
-                            method: 'read.object',
+                            method: 'object.read',
                             array: 'message_log',
                             $filter: {
                                 sort: [
@@ -142,11 +142,11 @@ class SocketServer extends EventEmitter {
 
             this.organizations.set(organization_id, organization)
 
-            this.emit('update.object', {
-                method: 'update.object',
+            this.emit('object.update', {
+                method: 'object.update',
                 array: 'organizations',
                 object: {
-                    _id: organization_id, ['$push.activeHost']: socket.socketUrl // needs socketId
+                    _id: organization_id, ['$addToSet.activeHost']: socket.socketUrl // needs socketId
                 },
                 organization_id
             });
@@ -234,8 +234,8 @@ class SocketServer extends EventEmitter {
 
                 if (!Object.keys(clients).length) {
                     this.organizations.delete(socket.organization_id);
-                    this.emit('update.object', {
-                        method: 'update.object',
+                    this.emit('object.update', {
+                        method: 'object.update',
                         array: 'organizations',
                         object: {
                             _id: organization_id, ['$pull.activeHost']: socket.socketUrl
@@ -348,7 +348,11 @@ class SocketServer extends EventEmitter {
 
                     const authorized = await this.authorize.check(data, socket.user_id)
                     let errors = {}
-                    if (authorized.serverOrganization === false) {
+                    if (authorized === false) {
+                        delete data.socket
+                        data.error = 'authorization failed'
+                        return socket.send(JSON.stringify(data))
+                    } else if (authorized.serverOrganization === false) {
                         organization.status = errors.status = false;
                         organization.serverOrganization = false;
                         organization.error = authorized.error
@@ -426,15 +430,16 @@ class SocketServer extends EventEmitter {
             if (authorized && authorized.authorized)
                 data = authorized.authorized
 
-            if (data.log !== false && data.log !== 'false' && !data.method.startsWith('read.') && data.method !== 'updateUserStatus' && data.method !== 'userStatus' && data.method !== 'signIn' && data.method !== 'signUp') {
-                let object = { url: socket.socketUrl, data }
-                delete object.socket
-                this.emit('create.object', {
-                    method: 'create.object',
-                    array: 'message_log',
-                    object,
-                    organization_id: data.organization_id
-                });
+            if (data.log !== false && data.log !== 'false' && !data.method.endsWith('.read') && data.method !== 'updateUserStatus' && data.method !== 'userStatus' && data.method !== 'signIn' && data.method !== 'signUp') {
+                // TODO: store logged messages more efficently by combing objects wherever possible
+                // let object = { url: socket.socketUrl, data }
+                // delete object.socket
+                // this.emit('object.create', {
+                //     method: 'object.create',
+                //     array: 'message_log',
+                //     object,
+                //     organization_id: data.organization_id
+                // });
             }
 
             let sockets = this.get(data);

package/src/mesh.js

@@ -16,7 +16,7 @@ async function addServer(data) {
 
     // TODO: needs to get orgaizations activeRegions
     let activeRegions = await crud.send({
-        method: 'read.object',
+        method: 'object.read',
         array: 'organizations',
         object: { _id: data.organization_id },
         organization_id: data.organization_id