@cocreate/socket-server 1.26.0 → 1.27.1

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [1.27.1](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.27.0...v1.27.1) (2024-01-17)
+
+
+### Bug Fixes
+
+* handling of host and origin. Updated to support new query system ([61a1c68](https://github.com/CoCreate-app/CoCreate-socket-server/commit/61a1c685a1d3466836b19867558842632c7994a4))
+
+# [1.27.0](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.26.0...v1.27.0) (2024-01-08)
+
+
+### Bug Fixes
+
+* applied host to define environment/branch ([fad44e5](https://github.com/CoCreate-app/CoCreate-socket-server/commit/fad44e52babae6dd142c22e88214956e2d3dfd97))
+
+
+### Features
+
+* bumped CoCreate dependencies to their latest versions ([b043307](https://github.com/CoCreate-app/CoCreate-socket-server/commit/b043307cb515a75a6fafd261ddb6295ceaba0ba9))
+
 # [1.26.0](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.25.0...v1.26.0) (2024-01-03)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/socket-server",
-  "version": "1.26.0",
+  "version": "1.27.1",
   "description": "CoCreate-socket-server",
   "keywords": [
     "cocreate-socket",
@@ -40,9 +40,9 @@
   },
   "homepage": "https://cocreate.app/docs/CoCreate-socket-server",
   "dependencies": {
-    "@cocreate/config": "^1.8.0",
-    "@cocreate/uuid": "^1.9.0",
-    "@cocreate/utils": "^1.29.0",
+    "@cocreate/config": "^1.10.0",
+    "@cocreate/uuid": "^1.10.0",
+    "@cocreate/utils": "^1.30.0",
     "ws": "7.5.9"
   }
 }

package/src/index.js

@@ -25,11 +25,11 @@ class SocketServer extends EventEmitter {
             socket.destroy();
         });
 
-        server.https.on('upgrade', (request, socket, head) => this.upgrade(request, socket, head))
-        server.http.on('upgrade', (request, socket, head) => this.upgrade(request, socket, head))
+        server.https.on('upgrade', (request, socket, head) => this.upgrade(request, socket, head, 'wss'))
+        server.http.on('upgrade', (request, socket, head) => this.upgrade(request, socket, head, 'ws'))
     }
 
-    upgrade(request, socket, head) {
+    upgrade(request, socket, head, protocol) {
         const self = this;
         let organization_id = request.url.split('/')
         organization_id = organization_id[organization_id.length - 1]
@@ -53,20 +53,19 @@ class SocketServer extends EventEmitter {
                 socket.id = options.socketId;
                 socket.clientId = options.clientId;
                 socket.pathname = request.url
-                socket.origin = request.headers.origin || request.headers.host
+                socket.origin = request.headers.origin
+                socket.host = request.headers.host
 
-                if (socket.origin.startsWith('http'))
-                    socket.origin = socket.origin.replace('http', 'ws')
-
-                socket.socketUrl = socket.origin + socket.pathname
-
-                if (socket.origin && socket.origin !== 'null') {
+                if (!socket.host && socket.origin && socket.origin !== 'null') {
                     if (socket.origin.includes('://'))
                         socket.host = new URL(socket.origin).host
                     else
                         socket.host = socket.origin;
                 }
 
+                socket.socketUrl = protocol + '://' + socket.host + socket.pathname
+
+
                 // if (!await server.acme.checkCertificate(socket.host, organization_id))
                 //     return socket.send(JSON.stringify({ method: 'Access Denied', error: 'Host not whitelisted' }))
 
@@ -85,9 +84,10 @@ class SocketServer extends EventEmitter {
                     }
 
                     if (options.lastSynced)
-                        data.$filter.query = [
-                            { key: '_id', value: options.lastSynced, operator: '$gt' }
-                        ]
+                        data.$filter.query = {
+                            _id: { $gt: options.lastSynced }
+                        }
+
                     else
                         data.$filter.limit = 1
 
@@ -152,6 +152,7 @@ class SocketServer extends EventEmitter {
 
             this.emit('object.update', {
                 method: 'object.update',
+                host: socket.host,
                 array: 'organizations',
                 object: {
                     _id: organization_id, ['$addToSet.activeHost']: socket.socketUrl // needs socketId
@@ -244,6 +245,7 @@ class SocketServer extends EventEmitter {
                     this.organizations.delete(socket.organization_id);
                     this.emit('object.update', {
                         method: 'object.update',
+                        host: socket.host,
                         array: 'organizations',
                         object: {
                             _id: organization_id, ['$pull.activeHost']: socket.socketUrl
@@ -358,6 +360,7 @@ class SocketServer extends EventEmitter {
                     }
 
                     data.socket = socket
+                    data.host = socket.host
 
                     const authorized = await this.authorize.check(data, socket.user_id)
                     let errors = {}