@cocreate/socket-server 1.24.0 → 1.24.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.24.2](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.24.1...v1.24.2) (2023-12-09)
+
+
+### Bug Fixes
+
+* emit first part of method which is module name ([d5d2f2d](https://github.com/CoCreate-app/CoCreate-socket-server/commit/d5d2f2d70f1effece7e77c95cb409b82609ee228))
+
+## [1.24.1](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.24.0...v1.24.1) (2023-12-05)
+
+
+### Bug Fixes
+
+* async await upgrade to handle authenticate ([e6416f5](https://github.com/CoCreate-app/CoCreate-socket-server/commit/e6416f5725ece424b69a142b70de4a0ca6687869))
+
 # [1.24.0](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.23.0...v1.24.0) (2023-11-25)
 
 

package/package.json

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

package/src/index.js

@@ -30,7 +30,7 @@ class SocketServer extends EventEmitter {
             let organization_id = request.url.split('/')
             organization_id = organization_id[organization_id.length - 1]
 
-            this.wss.handleUpgrade(request, socket, head, function (socket) {
+            this.wss.handleUpgrade(request, socket, head, async function (socket) {
                 if (organization_id) {
                     let organization = self.organizations.get(organization_id)
                     if (organization && organization.status === false) {
@@ -87,7 +87,7 @@ class SocketServer extends EventEmitter {
                         self.emit('object.read', data);
 
                         if (self.authenticate) {
-                            const { user_id, expires } = self.authenticate.decodeToken(options.token)
+                            const { user_id, expires } = await self.authenticate.decodeToken(options.token, organization_id, options.clientId)
                             const userStatus = { socket, method: 'userStatus', user_id: options.user_id, clientId: options.clientId, userStatus: 'off', organization_id }
                             if (user_id) {
                                 options.user_id = user_id
@@ -403,8 +403,11 @@ class SocketServer extends EventEmitter {
                     if (authorized.authorized)
                         data = authorized.authorized
 
-                    this.emit(data.method, data);
-
+                    let mod = data.method.split('.')[0]
+                    if (['storage', 'database', 'array', 'index', 'object'].includes(mod))
+                        this.emit(data.method, data);
+                    else
+                        this.emit(mod, data);
                 }
             }
         } catch (e) {
@@ -414,6 +417,7 @@ class SocketServer extends EventEmitter {
 
     async send(data) {
         // const socket = this.sockets.get(data.socketId)
+        delete data.wsManager
         const socket = data.socket
 
         if (data.sync) {