just-another-http-api 1.2.5 → 1.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "just-another-http-api",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "A framework built on top of fastify aimed at removing the need for any network or server configuration. ",
   "homepage": "https://github.com/OllieEdge/just-another-http-api#readme",
   "repository": {

package/utils/WebsocketGroup.js

@@ -4,8 +4,10 @@ const { redis } = require ( 'eip-cloud-services' );
 class WebsocketGroup {
     
     constructor ( groupName, destroy, messageReceivedHandler, connectionClosedHandler ) {
+        this.timeOfCreation = Date.now ();
         this.groupName = groupName;
         this.destroy = destroy;
+        this.groupUuid = crypto.randomUUID ().substring ( 0, 8 );
         this.connections = new Map ();
         this.messageReceivedHandler = messageReceivedHandler || ( async () => {} );
         this.connectionClosedHandler = connectionClosedHandler;
@@ -79,22 +81,23 @@ class WebsocketGroup {
     }
 
     async #clean (connectionId) {
-        if ( this.connections.size === 0 ) {
-            this.connections.clear ();
-            await redis.unsubscribe ( `${this.groupName}_individualMessage`, this.#handleIndividualMessage.bind ( this ) );
-            await redis.unsubscribe ( `${this.groupName}_broadcast`, this.#broadcastMessageToClients.bind ( this ) );
-            await redis.unsubscribe ( `${this.groupName}_messageReceived`, this.#handleUserMessage.bind ( this ) );
-            this.destroy(this.groupName);
-        }
 
         if ( this.connectionClosedHandler !== null && typeof this.connectionClosedHandler === 'function') {
             try{
-            await this.connectionClosedHandler ( {groupName:this.groupName, connectionId} );
+                await this.connectionClosedHandler ( {groupName:this.groupName, connectionId} );
             }
             catch (error) {
                 console.error('Error in connectionClosedHandler:', error);
             }
         }
+
+        if ( this.connections.size === 0 ) {
+            this.connections.clear ();
+            await redis.unsubscribe ( `${this.groupName}_individualMessage` );
+            await redis.unsubscribe ( `${this.groupName}_broadcast` );
+            await redis.unsubscribe ( `${this.groupName}_messageReceived` );
+            this.destroy(this.groupName);
+        }
     }
 }
   

package/utils/websocketHandler.js

@@ -3,12 +3,12 @@ const WebsocketGroup = require ( './WebsocketGroup' );
 const websocketGroups = {};
 
 const getGroupInstance = async ( groupName, messageReceivedHandler, connectionClosedHandler ) => {
-    if ( !websocketGroups[ groupName ] ) {
+    if ( !websocketGroups[ groupName ] && messageReceivedHandler && connectionClosedHandler ) {
         websocketGroups[ groupName ] = new WebsocketGroup ( groupName, removeGroupInstance, messageReceivedHandler, connectionClosedHandler );
         await websocketGroups[ groupName ].initialize ();
     }
     
-    return websocketGroups[ groupName ];
+    return websocketGroups[ groupName ] || null;
 };
 
 const removeGroupInstance = async groupName => {