Web Socket Clients Refactoring

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)
 

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)

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()
 

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"
                 }
             ]
         }

Projects/Social-Trading/UI/modules/WebSocketsWebClient.js

@@ -1,4 +1,4 @@
-function newSocialTradingModulesWebSocketsClient() {
+function newSocialTradingModulesWebSocketsWebClient() {
 
     let thisObject = {
         sendMessage: sendMessage,