@cocreate/socket-server 1.22.0 → 1.24.0

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+# [1.24.0](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.23.0...v1.24.0) (2023-11-25)
+
+
+### Bug Fixes
+
+* update licensing details ([e105a05](https://github.com/CoCreate-app/CoCreate-socket-server/commit/e105a05f3d5c9a0f889a99f4cf8f086c46c93679))
+
+
+### Features
+
+* upgrade dependencies for latest features and fixes ([33f5073](https://github.com/CoCreate-app/CoCreate-socket-server/commit/33f50737ff478d1147ea183e2fa058d5dc8dca35))
+
+# [1.23.0](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.22.0...v1.23.0) (2023-11-25)
+
+
+### Bug Fixes
+
+* userStatus across various clientid ([507d5e5](https://github.com/CoCreate-app/CoCreate-socket-server/commit/507d5e5b7e17a6aadb6b1b4522b8f753d0156715))
+
+
+### Features
+
+* upgrade dependencies for latest features and fixes ([5176e69](https://github.com/CoCreate-app/CoCreate-socket-server/commit/5176e69558a57af55d003608fb24515103877edd))
+
 # [1.22.0](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.21.11...v1.22.0) (2023-11-19)
 
 

package/README.md

@@ -1,4 +1,5 @@
 # CoCreate-socket-server
+
 A simple socket-server component in vanilla javascript. Easily configured using HTML5 data-attributes and/or JavaScript API. Take it for a spin in our [playground!](https://cocreate.app/docs/socket-server)
 
 ![GitHub latest release](https://img.shields.io/github/v/release/CoCreate-app/CoCreate-socket-server?style=flat-square)
@@ -16,25 +17,27 @@ We appreciate your continued support, thank you!
 
 # Table of Contents
 
-- [Table of Contents](#table-of-contents)
-- [Announcements](#announcements)
-- [Roadmap](#roadmap)
-- [How to Contribute](#how-to-contribute)
-- [About](#about)
-- [License](#license)
+-   [Table of Contents](#table-of-contents)
+-   [Announcements](#announcements)
+-   [Roadmap](#roadmap)
+-   [How to Contribute](#how-to-contribute)
+-   [About](#about)
+-   [License](#license)
 
 <a name="announcements"></a>
+
 # Announcements
 
-All updates to this library are documented in our [CHANGELOG](https://github.com/CoCreate-app/CoCreate-socket-server/blob/master/CHANGELOG.md) and [releases](https://github.com/CoCreate-app/CoCreate-socket-server/releases). You may also subscribe to email for releases and breaking changes. 
+All updates to this library are documented in our [CHANGELOG](https://github.com/CoCreate-app/CoCreate-socket-server/blob/master/CHANGELOG.md) and [releases](https://github.com/CoCreate-app/CoCreate-socket-server/releases). You may also subscribe to email for releases and breaking changes.
 
 <a name="roadmap"></a>
+
 # Roadmap
 
 If you are interested in the future direction of this project, please take a look at our open [issues](https://github.com/CoCreate-app/CoCreate-socket-server/issues) and [pull requests](https://github.com/CoCreate-app/CoCreate-socket-server/pulls). We would love to hear your feedback.
 
-
 <a name="about"></a>
+
 # About
 
 CoCreate-socket-server is guided and supported by the CoCreate Developer Experience Team.
@@ -44,9 +47,19 @@ Please Email the Developer Experience Team [here](mailto:develop@cocreate.app) i
 CoCreate-socket-server is maintained and funded by CoCreate. The names and logos for CoCreate are trademarks of CoCreate, LLC.
 
 <a name="contribute"></a>
+
 # How to Contribute
 
 We encourage contribution to our libraries (you might even score some nifty swag), please see our [CONTRIBUTING](https://github.com/CoCreate-app/CoCreate-socket-server/blob/master/CONTRIBUTING.md) guide for details.
 
+<a name="license"></a>
+
 # License
-[The MIT License (MIT)](https://github.com/CoCreate-app/CoCreate-socket-server/blob/master/LICENSE)
+
+This software is dual-licensed under the GNU Affero General Public License version 3 (AGPLv3) and a commercial license.
+
+-   **Open Source Use**: For open-source projects and non-commercial use, this software is available under the AGPLv3. The AGPLv3 allows you to freely use, modify, and distribute this software, provided that all modifications and derivative works are also licensed under the AGPLv3. For the full license text, see the [LICENSE file](https://github.com/CoCreate-app/CoCreate-socket-server/blob/master/LICENSE).
+
+-   **Commercial Use**: For-profit companies and individuals intending to use this software for commercial purposes must obtain a commercial license. The commercial license is available when you sign up for an API key on our [website](https://cocreate.app). This license permits proprietary use and modification of the software without the copyleft requirements of the AGPLv3. It is ideal for integrating this software into proprietary commercial products and applications.
+
+If you have not purchased a commercial license and intend to use this software for commercial purposes, you are required to sign up for an API key on our website.

package/package.json

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

package/src/index.js

@@ -88,7 +88,7 @@ class SocketServer extends EventEmitter {
 
                         if (self.authenticate) {
                             const { user_id, expires } = self.authenticate.decodeToken(options.token)
-                            const userStatus = { socket, method: 'userStatus', user_id: options.user_id, userStatus: 'off', organization_id }
+                            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
                                 socket.user_id = user_id;
@@ -181,7 +181,7 @@ class SocketServer extends EventEmitter {
         }
 
         if (socket.user_id) {
-            this.emit('userStatus', { socket, user_id: socket.user_id, userStatus: 'on', organization_id });
+            this.emit('userStatus', { socket, user_id: socket.user_id, clientId: socket.clientId, userStatus: 'on', organization_id });
             let user = this.users.get(socket.user_id)
 
             if (!Array.isArray(user)) {
@@ -298,7 +298,7 @@ class SocketServer extends EventEmitter {
                         clearTimeout(userDebounceTimer);
                         userDebounceTimer = setTimeout(() => {
                             this.users.delete(socket.user_id);
-                            this.emit('userStatus', { socket, user_id: socket.user_id, userStatus: 'off', organization_id });
+                            this.emit('userStatus', { socket, user_id: socket.user_id, clientId: socket.clientId, userStatus: 'off', organization_id });
                         }, 10000);
 
                         this.users.set(socket.user_id, userDebounceTimer)
@@ -333,8 +333,13 @@ class SocketServer extends EventEmitter {
                     console.log('data.method: ', data.method)
 
                 if (socket.user_id && socket.expires && new Date(new Date().toISOString()).getTime() >= socket.expires) {
+                    // data.error = 'Token expired'
+                    // socket.send(JSON.stringify(data))
+                    await this.send({
+                        socket, method: 'updateUserStatus', user_id: socket.user_id, clientId: data.clientId, userStatus: 'off', socketId: data.socketId, organization_id
+                    })
                     socket.user_id = socket.expires = null
-                    this.send({ socket, method: 'updateUserStatus', userStatus: 'off', socketId: data.socketId, organization_id })
+                    return
                 }
 
                 if (this.authorize) {