From c5564f1e697fd6bd1817c63bad22d16f8e808b22 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 10 Nov 2021 12:44:50 +0100 Subject: [PATCH] Event received from browser to browser going through 1 network node --- Desktop/DesktopApp.js | 1 - .../SA/Modules/WebSocketsNetworkClient.js | 16 ++++++++-------- .../DK/modules/P2PNetworkInterface.js | 7 +++---- .../DK/modules/WebAppInterface.js | 2 +- .../UI/modules/WebSocketsWebAppClient.js | 18 +++++++++--------- 5 files changed, 21 insertions(+), 23 deletions(-) diff --git a/Desktop/DesktopApp.js b/Desktop/DesktopApp.js index 2250a7e63..3a8cc7c6f 100644 --- a/Desktop/DesktopApp.js +++ b/Desktop/DesktopApp.js @@ -5,7 +5,6 @@ exports.newDesktopApp = function newDesktopApp() { p2pNetworkClient: undefined, p2pNetwork: undefined, p2pNetworkPeers: undefined, - webSocketsClient: undefined, webSocketsInterface: undefined, webAppInterface: undefined, p2pNetworkInterface: undefined, diff --git a/Projects/Network/SA/Modules/WebSocketsNetworkClient.js b/Projects/Network/SA/Modules/WebSocketsNetworkClient.js index 3ef9df858..0b4322ec0 100644 --- a/Projects/Network/SA/Modules/WebSocketsNetworkClient.js +++ b/Projects/Network/SA/Modules/WebSocketsNetworkClient.js @@ -288,20 +288,20 @@ exports.newNetworkModulesWebSocketsNetworkClient = function newNetworkModulesWeb } } - function onMenssage(message) { + function onMenssage(socketMessage) { - let response = JSON.parse(message.data) + let message = JSON.parse(socketMessage.data) /* We get the function that is going to resolve or reject the promise given. */ - let onMenssageFunction = onMessageFunctionsMap.get(response.messageId) + let onMenssageFunction = onMessageFunctionsMap.get(message.messageId) if (onMenssageFunction !== undefined) { /* The message received is a response to a message sent. */ - onMessageFunctionsMap.delete(response.messageId) - onMenssageFunction(response) + onMessageFunctionsMap.delete(message.messageId) + onMenssageFunction(message) } else { /* The message received is a not response to a message sent. @@ -310,9 +310,9 @@ exports.newNetworkModulesWebSocketsNetworkClient = function newNetworkModulesWeb This can only happen when this module is running at an APP like the Desktop App. */ - let messageHeader + let event try { - messageHeader = JSON.parse(message) + event = JSON.parse(message.eventMessage) } catch (err) { console.log('[ERROR] Web Sockets Network Client -> onMenssage -> message = ' + message) console.log('[ERROR] Web Sockets Network Client -> onMenssage -> err.stack = ' + err.stack) @@ -320,7 +320,7 @@ exports.newNetworkModulesWebSocketsNetworkClient = function newNetworkModulesWeb return } - DK.desktopApp.p2pNetworkInterface.messageReceived(messageHeader.payload) + DK.desktopApp.p2pNetworkInterface.eventReceived(event) } } } \ No newline at end of file diff --git a/Projects/Social-Trading/DK/modules/P2PNetworkInterface.js b/Projects/Social-Trading/DK/modules/P2PNetworkInterface.js index 3674307ef..8363dc38c 100644 --- a/Projects/Social-Trading/DK/modules/P2PNetworkInterface.js +++ b/Projects/Social-Trading/DK/modules/P2PNetworkInterface.js @@ -7,7 +7,7 @@ exports.newSocialTradingModulesP2PNetworkInterface = function newSocialTradingMo by the user running this app, in particular trading events. */ let thisObject = { - messageReceived: messageReceived, + eventReceived: eventReceived, initialize: initialize, finalize: finalize } @@ -22,8 +22,7 @@ exports.newSocialTradingModulesP2PNetworkInterface = function newSocialTradingMo } - async function messageReceived(message) { - message.messageId = undefined - DK.webSocketsInterface.sendToWebApp(JSON.stringify(response)) + async function eventReceived(event) { + DK.desktopApp.webSocketsInterface.sendToWebApp(JSON.stringify(event)) } } \ No newline at end of file diff --git a/Projects/Social-Trading/DK/modules/WebAppInterface.js b/Projects/Social-Trading/DK/modules/WebAppInterface.js index 96830e81e..d6ef8c92c 100644 --- a/Projects/Social-Trading/DK/modules/WebAppInterface.js +++ b/Projects/Social-Trading/DK/modules/WebAppInterface.js @@ -132,7 +132,7 @@ exports.newSocialTradingModulesWebAppInterface = function newSocialTradingModule let response = { result: 'Ok', message: 'Web App Interface Event Processed.', - data: await DK.desktopApp.webSocketsClient.sendMessage(JSON.stringify(messageHeader)) + data: await DK.desktopApp.p2pNetworkPeers.sendMessage(JSON.stringify(messageHeader)) } return response } diff --git a/Projects/Social-Trading/UI/modules/WebSocketsWebAppClient.js b/Projects/Social-Trading/UI/modules/WebSocketsWebAppClient.js index 9f15f93ea..227719958 100644 --- a/Projects/Social-Trading/UI/modules/WebSocketsWebAppClient.js +++ b/Projects/Social-Trading/UI/modules/WebSocketsWebAppClient.js @@ -94,28 +94,28 @@ function newSocialTradingModulesWebSocketsWebAppClient() { } } - function onMenssage(message) { + function onMenssage(socketMessage) { - let response = JSON.parse(message.data) + let message = JSON.parse(socketMessage.data) /* We get the function that is going to resolve or reject the promise given. */ - onMenssageFunction = onMessageFunctionsMap.get(response.messageId) - onMessageFunctionsMap.delete(response.messageId) + onMenssageFunction = onMessageFunctionsMap.get(message.messageId) + onMessageFunctionsMap.delete(message.messageId) if (onMenssageFunction !== undefined) { /* The message received is a response to a message sent. */ - onMenssageFunction(response) + onMenssageFunction(message) } else { /* The message received is a not response to a message sent. - That means that is a notification received from the Client App. + That means that is an event received from the Client App. */ - let messageHeader + let event try { - messageHeader = JSON.parse(message) + event = JSON.parse(message) } catch (err) { console.log('[ERROR] Web Sockets WebApp Client -> onMenssage -> message = ' + message) console.log('[ERROR] Web Sockets WebApp Client -> onMenssage -> err.stack = ' + err.stack) @@ -123,7 +123,7 @@ function newSocialTradingModulesWebSocketsWebAppClient() { return } - UI.webApp.messageReceived(messageHeader.payload) + UI.webApp.messageReceived(JSON.stringify(event)) } } } \ No newline at end of file