added eventName property

controllers/khokhaEntryController.js

@@ -7,6 +7,7 @@ exports.addNewEntry = async (req, res, next) => {
         if(ws.isConnected(req.body.connectionId)===false){
             return res.json({
                 success: false,
+                eventName: "ERROR",
                 message: "Socket is not connected"
             });
         }
@@ -26,6 +27,7 @@ exports.addNewEntry = async (req, res, next) => {
 
         ws.sendMessageToSocket(req.body.connectionId, {
             success: true,
+            eventName: "ENTRY_ADDED",
             message: "Entry Added to database!",
             data: entry
         });
@@ -46,6 +48,7 @@ exports.closeEntry = async (req, res, next) => {
         if(ws.isConnected(req.body.connectionId)===false){
             return res.json({
                 success: false,
+                eventName: "ERROR",
                 message: "Socket is not connected"
             });
         }
@@ -55,6 +58,7 @@ exports.closeEntry = async (req, res, next) => {
         if (!entry) {
             ws.sendMessageToSocket(req.body.connectionId, {
                 success: false,
+                eventName: "ERROR",
                 message: "Entry not found!"
             });
             ws.closeConnection(req.body.connectionId);
@@ -67,6 +71,7 @@ exports.closeEntry = async (req, res, next) => {
             if(entry.isClosed){
                 ws.sendMessageToSocket(req.body.connectionId, {
                     success: false,
+                    eventName: "ERROR",
                     message: "Entry Already Closed!",
                 });
                 ws.closeConnection(req.body.connectionId);
@@ -84,6 +89,7 @@ exports.closeEntry = async (req, res, next) => {
 
             ws.sendMessageToSocket(req.body.connectionId, {
                 success: true,
+                eventName: "ENTRY_CLOSED",
                 message: "Entry Closed Successfully!",
                 data: newEntry
             });

handlers/websocketHandler.js

@@ -13,6 +13,7 @@ exports.connectionHandler = async(socket, req) => {
             socket.send(JSON.stringify({connectionId: socket.connectionId}));
             setTimeout(() => {
                 socket.send(JSON.stringify({
+                    eventName: "TIMEOUT",
                     message: 'Timeout'
                 }));
                 socket.close();
@@ -23,13 +24,15 @@ exports.connectionHandler = async(socket, req) => {
             if(err.response !== undefined){
                 socket.send(JSON.stringify({
                     success: false,
+                    eventName: "ERROR",
                     statusCode: err.response.status,
                     error: err.response.data.error,
                     message: err.response.data.message
                 }));
             }else{
                 socket.send(JSON.stringify({
                     success: false,
+                    eventName: "ERROR",
                     statusCode: 500,
                     error: 'Internal Server Error',
                     message: err.message
@@ -38,6 +41,7 @@ exports.connectionHandler = async(socket, req) => {
         }else{
             socket.send(JSON.stringify({
                 success: false,
+                eventName: "ERROR",
                 statusCode: err.statusCode,
                 error: err.name,
                 message: err.message

helpers/onestopUserHelper.js

@@ -4,9 +4,7 @@ const { onestopUserEndpoint } = require("../shared/constants");
 exports.getOnestopUser = async(authHeader, onestopSecurityKey) => {
     const res = await axios.get(onestopUserEndpoint, {
         headers: {
-            // "authorization": "Bearer ",
             "authorization": authHeader,
-            // "security-key": "OneStop-Test"
             "security-key": onestopSecurityKey,
         },
     });