@cocreate/socket-server 1.21.5 → 1.21.7

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [1.21.7](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.21.6...v1.21.7) (2023-11-09)
+
+
+### Bug Fixes
+
+* meta name typo ([37b85be](https://github.com/CoCreate-app/CoCreate-socket-server/commit/37b85bee20c4ff7e73eccca039f9dbeb84c82417))
+* update crud methods ([2853e1f](https://github.com/CoCreate-app/CoCreate-socket-server/commit/2853e1f82c76998cdf2d5de3ee05128c454bd2e8))
+* update host ([4139426](https://github.com/CoCreate-app/CoCreate-socket-server/commit/41394268a2b0814d2373870184c7d30c60b94383))
+* updated date to ISO format with UTC timezone ([98b5e0a](https://github.com/CoCreate-app/CoCreate-socket-server/commit/98b5e0abd9768e8297b54db9a4b86babf3fc69ca))
+
+## [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)
 
 

package/CoCreate.config.js

@@ -12,8 +12,7 @@ module.exports = {
                 "pathname": "/docs/socket-server/index.html",
                 "src": "{{./docs/index.html}}",
                 "host": [
-                    "*",
-                    "general.cocreate.app"
+                    "*"
                 ],
                 "directory": "socket-server",
                 "content-type": "text/html",

package/docs/index.html

@@ -11,10 +11,10 @@
             sizes="32x32"
             href="https://cocreate.app/images/favicon.ico" />
         <meta
-            key="description"
+            name="description"
             content="A simple HTML5 and pure javascript component. Easy configuration using data-attributes and highly styleable." />
         <meta
-            key="keywords"
+            name="keywords"
             content="helper classes, utility classes, css framework, css library, inline style classes" />
         <meta name="robots" content="index,follow" />
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/socket-server",
-  "version": "1.21.5",
+  "version": "1.21.7",
   "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: [
@@ -82,7 +82,7 @@ class SocketServer extends EventEmitter {
                         else
                             data.$filter.limit = 1
 
-                        self.emit('read.object', data);
+                        self.emit('object.read', data);
 
                         if (self.authenticate) {
                             const { user_id, expires } = self.authenticate.decodeToken(options.token)
@@ -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
@@ -330,7 +330,7 @@ class SocketServer extends EventEmitter {
                 if (data.method === 'region.added' || data.method === 'region.removed')
                     console.log('data.method: ', data.method)
 
-                if (socket.user_id && socket.expires && new Date().getTime() >= socket.expires) {
+                if (socket.user_id && socket.expires && new Date(new Date().toISOString()).getTime() >= socket.expires) {
                     socket.user_id = socket.expires = null
                     this.send({ socket, method: 'updateUserStatus', userStatus: 'off', socketId: data.socketId, organization_id })
                 }
@@ -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,11 +430,12 @@ 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') {
+            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('create.object', {
-                //     method: 'create.object',
+                // this.emit('object.create', {
+                //     method: 'object.create',
                 //     array: 'message_log',
                 //     object,
                 //     organization_id: data.organization_id

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