discovery launch changes to check if app is actively connected or not

rdkcentral · Nov 8, 2024 · 64fcb0c · 64fcb0c
1 parent 247e69c
commit 64fcb0c
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,15 @@
 # Change Log
 
 All notable changes to this project will be documented in this file.
+## [1.0.4] - 2024-02-13
+
+### Added
+
+* Added ability to check if an active userid is connected or not to mock-firebolt from yaml file
+
+### Changed
+
+* Updated definition of ctx in files to include new function `getWebSocketConnectionForUser` that will internally return `getWsForUser` to check if an active userid is connected or not to mock-firebolt 
 
 ## [1.0.3] - 2023-11-30
 

diff --git a/cli/package.json b/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebolt-js/mock-firebolt-cli",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Command-line interface for controlling the Mock Firebolt server",
   "main": "./src/cli.mjs",
   "scripts": {},

diff --git a/conduit/package.json b/conduit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "conduit",
   "description": "A TV app that works in concert with Mock Firebolt in Reverse Proxy mode",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "private": true,
   "license": "Apache 2.0",
   "author": "Mike Fine <mike_fine@cable.comcast.com>",

diff --git a/server/package.json b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebolt-js/mock-firebolt",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Controllable mock Firebolt server",
   "main": "./build/index.mjs",
   "scripts": {

diff --git a/server/src/events.mjs b/server/src/events.mjs
@@ -341,6 +341,7 @@ function coreSendEvent(isBroadcast, ws, userId, method, result, msg, fSuccess, f
               setInterval: setInterval,
               set: function ss(key, val, scope) { return stateManagement.setScratch(userId, key, val, scope) },
               get: function gs(key) { return stateManagement.getScratch(userId, key); },
+              getWebSocketConnectionForUser: function gw(userId) { return userManagement.getWsForUser(userId) },
               delete: function ds(key, scope) { return stateManagement.deleteScratch(userId, key, scope)},
               closeConnection: function cc() {return userManagement.closeConnection(userId, ws)},
               closeAllConnections: function closeallconn() {return userManagement.closeAllConnections(userId)},
@@ -373,6 +374,7 @@ function coreSendEvent(isBroadcast, ws, userId, method, result, msg, fSuccess, f
               setInterval: setInterval,
               set: function ss(key, val, scope) { return stateManagement.setScratch(userId, key, val, scope) },
               get: function gs(key) { return stateManagement.getScratch(userId, key); },
+              getWebSocketConnectionForUser: function gw(userId) { return userManagement.getWsForUser(userId) },
               delete: function ds(key, scope) { return stateManagement.deleteScratch(userId, key, scope)},
               closeConnection: function cc() {return userManagement.closeConnection(userId, ws)},
               closeAllConnections: function closeallconn() {return userManagement.closeAllConnections(userId)},

diff --git a/server/src/messageHandler.mjs b/server/src/messageHandler.mjs
@@ -182,6 +182,7 @@ async function handleMessage(message, userId, ws) {
           setInterval: setInterval,
           set: function ss(key, val, scope) { return stateManagement.setScratch(userId, key, val, scope) },
           get: function gs(key) { return stateManagement.getScratch(userId, key); },
+          getWebSocketConnectionForUser: function gw(userId) { return userManagement.getWsForUser(userId) },
           delete: function ds(key, scope) { return stateManagement.deleteScratch(userId, key, scope)},
           delay: function delay(ms){ return  util.delay(ms) },
           closeConnection: function cc() {return userManagement.closeConnection(userId, ws)},
@@ -290,6 +291,7 @@ async function handleMessage(message, userId, ws) {
           setInterval: setInterval,
           set: function ss(key, val, scope) { return stateManagement.setScratch(userId, key, val, scope) },
           get: function gs(key) { return stateManagement.getScratch(userId, key); },
+          getWebSocketConnectionForUser: function gw(userId) { return userManagement.getWsForUser(userId) },
           delete: function ds(key, scope) { return stateManagement.deleteScratch(userId, key, scope)},
           closeConnection: function cc() {return userManagement.closeConnection(userId,ws)},
           closeAllConnections: function closeallconn() {return userManagement.closeAllConnections(userId)},

diff --git a/server/src/stateManagement.mjs b/server/src/stateManagement.mjs
@@ -29,7 +29,7 @@ import * as commonErrors from './commonErrors.mjs';
 import * as util from './util.mjs';
 import { sendBroadcastEvent, sendEvent, logSuccess, logErr, logFatalErr } from './events.mjs';
 import { v4 as uuidv4 } from 'uuid';
-import { parseUser, closeConnection, closeAllConnections } from './userManagement.mjs';
+import { parseUser, closeConnection, closeAllConnections, getWsForUser } from './userManagement.mjs';
 
 const Mode = {
   BOX: 'BOX',            // Log settrs, return default defaults for each gettr based on first example within OpenRPC specification
@@ -242,6 +242,7 @@ async function handleDynamicResponseValues(userId, methodName, params, ws, resp)
         setInterval: setInterval,
         set: function ss(key, val, scope) { return setScratch(userId, key, val, scope) },
         get: function gs(key) { return getScratch(userId, key); },
+        getWebSocketConnectionForUser: function gw(userId) { return getWsForUser(userId) },
         delete: function ds(key, scope) { return deleteScratch(userId, key, scope)},
         delay: function delay(ms){ return  util.delay(ms) },
         closeConnection: function cc() {return closeConnection(userId, ws)},
@@ -317,6 +318,7 @@ async function handleStaticAndDynamicResult(userId, methodName, params, resp){
       const ctx = {
         set: function ss(key, val, scope) { return setScratch(userId, key, val, scope) },
         get: function gs(key) { return getScratch(userId, key); },
+        getWebSocketConnectionForUser: function gw(userId) { return getWsForUser(userId) },
         delete: function ds(key, scope) { return deleteScratch(userId, key, scope)},
         uuid: function cuuid() {return createUuid()},
       };

diff --git a/server/src/userManagement.mjs b/server/src/userManagement.mjs
@@ -95,9 +95,11 @@ function getWssForUser(userId) {
 function getWsForUser(userId) {
   if ( user2ws.has(''+userId) ) {
     let wsArray=user2ws.get(''+userId);
+    if (wsArray && wsArray.length > 0) {
     let latestWsConnection=wsArray[(wsArray.length-1)]
     return latestWsConnection;
   }
+}
   return undefined;
 }