From 5c9597950bc449f99506232c333bd70c458d0b5e Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 22 Oct 2021 10:46:20 +0200 Subject: [PATCH] Web Socket Clients Refactoring --- Desktop/DesktopApp.js | 2 +- Desktop/UI/WebApp.js | 10 +++++----- ...{WebSocketsClient.js => WebSocketsAppClient.js} | 3 +-- Projects/ProjectsSchema.json | 14 +++++++------- ...{WebSocketsClient.js => WebSocketsWebClient.js} | 2 +- 5 files changed, 15 insertions(+), 16 deletions(-) rename Projects/Network/SA/Modules/{WebSocketsClient.js => WebSocketsAppClient.js} (99%) rename Projects/Social-Trading/UI/modules/{WebSocketsClient.js => WebSocketsWebClient.js} (98%) diff --git a/Desktop/DesktopApp.js b/Desktop/DesktopApp.js index 4235ab1b5..3a24eb71b 100644 --- a/Desktop/DesktopApp.js +++ b/Desktop/DesktopApp.js @@ -19,7 +19,7 @@ exports.newDesktopApp = function newDesktopApp() { /* This is the Web Sockets client that interacts with the Superalgos Network. */ - DK.running.webSocketsClient = SA.projects.network.modules.webSocketsClient.newNetworkModulesWebSocketsClient() + DK.running.webSocketsClient = SA.projects.network.modules.webSocketsAppClient.newNetworkModulesWebSocketsAppClient() await DK.running.webSocketsClient.initialize() console.log('Desktop Client Connected to Network Node via Web Sockets ................... Connected to port ' + global.env.NETWORK_WEB_SOCKETS_INTERFACE_PORT) diff --git a/Desktop/UI/WebApp.js b/Desktop/UI/WebApp.js index 6675b0ba4..c219e51ef 100644 --- a/Desktop/UI/WebApp.js +++ b/Desktop/UI/WebApp.js @@ -19,7 +19,7 @@ function newWebApp() { try { setupRootObject(UI, 'UI') setupRootObject(SA, 'SA') - await UI.projects.socialTrading.modules.webSocketsClient.initialize() + await UI.projects.socialTrading.modules.webSocketsWebClient.initialize() loadWUserProfileTimeline() loadWhoToFollow() setupEventHandlers() @@ -113,7 +113,7 @@ function newWebApp() { queryMessage: JSON.stringify(queryMessage) } - await UI.projects.socialTrading.modules.webSocketsClient.sendMessage( + await UI.projects.socialTrading.modules.webSocketsWebClient.sendMessage( JSON.stringify(query) ) .then(addToContentDiv) @@ -183,7 +183,7 @@ function newWebApp() { queryMessage: JSON.stringify(queryMessage) } - await UI.projects.socialTrading.modules.webSocketsClient.sendMessage( + await UI.projects.socialTrading.modules.webSocketsWebClient.sendMessage( JSON.stringify(query) ) .then(addWhoToFollowTable) @@ -360,7 +360,7 @@ function newWebApp() { eventMessage: JSON.stringify(eventMessage) } - await UI.projects.socialTrading.modules.webSocketsClient.sendMessage( + await UI.projects.socialTrading.modules.webSocketsWebClient.sendMessage( JSON.stringify(event) ) .then(resolve) @@ -396,7 +396,7 @@ function newWebApp() { eventMessage: JSON.stringify(eventMessage) } - await UI.projects.socialTrading.modules.webSocketsClient.sendMessage( + await UI.projects.socialTrading.modules.webSocketsWebClient.sendMessage( JSON.stringify(event) ) .then(resolve) diff --git a/Projects/Network/SA/Modules/WebSocketsClient.js b/Projects/Network/SA/Modules/WebSocketsAppClient.js similarity index 99% rename from Projects/Network/SA/Modules/WebSocketsClient.js rename to Projects/Network/SA/Modules/WebSocketsAppClient.js index 3518d86fd..18572b7c7 100644 --- a/Projects/Network/SA/Modules/WebSocketsClient.js +++ b/Projects/Network/SA/Modules/WebSocketsAppClient.js @@ -1,4 +1,4 @@ -exports.newNetworkModulesWebSocketsClient = function newNetworkModulesWebSocketsClient() { +exports.newNetworkModulesWebSocketsAppClient = function newNetworkModulesWebSocketsAppClient() { let thisObject = { sendMessage: sendMessage, @@ -30,7 +30,6 @@ exports.newNetworkModulesWebSocketsClient = function newNetworkModulesWebSockets /* Here we will pick a Network Node from all users profiles available that do have a Network Node running. // TODO In the meantime, we will assume that we have chosen the following Network Node to connect to. - */ web3 = new SA.nodeModules.web3() diff --git a/Projects/ProjectsSchema.json b/Projects/ProjectsSchema.json index c1d5710cf..238586f44 100644 --- a/Projects/ProjectsSchema.json +++ b/Projects/ProjectsSchema.json @@ -1365,10 +1365,10 @@ "globals": [], "modules": [ { - "name": "Web Sockets Client", - "propertyName": "webSocketsClient", - "functionName": "newNetworkModulesWebSocketsClient", - "fileName": "WebSocketsClient.js" + "name": "Web Sockets App Client", + "propertyName": "webSocketsAppClient", + "functionName": "newNetworkModulesWebSocketsAppClient", + "fileName": "WebSocketsAppClient.js" } ], "utilities": [] @@ -1567,9 +1567,9 @@ "modules": [ { "name": "Web Sockets Client", - "propertyName": "webSocketsClient", - "functionName": "newSocialTradingModulesWebSocketsClient", - "fileName": "WebSocketsClient.js" + "propertyName": "webSocketsWebClient", + "functionName": "newSocialTradingModulesWebSocketsWebClient", + "fileName": "WebSocketsWebClient.js" } ] } diff --git a/Projects/Social-Trading/UI/modules/WebSocketsClient.js b/Projects/Social-Trading/UI/modules/WebSocketsWebClient.js similarity index 98% rename from Projects/Social-Trading/UI/modules/WebSocketsClient.js rename to Projects/Social-Trading/UI/modules/WebSocketsWebClient.js index 64d5a37d3..0fb4e3d68 100644 --- a/Projects/Social-Trading/UI/modules/WebSocketsClient.js +++ b/Projects/Social-Trading/UI/modules/WebSocketsWebClient.js @@ -1,4 +1,4 @@ -function newSocialTradingModulesWebSocketsClient() { +function newSocialTradingModulesWebSocketsWebClient() { let thisObject = { sendMessage: sendMessage,