fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Desktop App Client running at different web and websocket ports

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2021-11-08 17:42:49 +01:00
1 parent b5a2298fb0
commit aada1165d1
8 files changed
+20 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Desktop/DesktopApp.js
+4 -4
View File
@@ -17,8 +17,8 @@ exports.newDesktopApp = function newDesktopApp() {
async function run() { async function run() {
setupNetwork() await setupNetwork()
setupServices() await setupServices()
async function setupNetwork() { async function setupNetwork() {
/* /*
@@ -59,11 +59,11 @@ exports.newDesktopApp = function newDesktopApp() {
*/ */
thisObject.webSocketsInterface = DK.projects.socialTrading.modules.webSocketsInterface.newDesktopModulesWebSocketsInterface() thisObject.webSocketsInterface = DK.projects.socialTrading.modules.webSocketsInterface.newDesktopModulesWebSocketsInterface()
thisObject.webSocketsInterface.initialize() thisObject.webSocketsInterface.initialize()
console.log('Desktop Client Web Sockets Interface ....................................... Listening at port ' + global.env.DESKTOP_WEB_SOCKETS_INTERFACE_PORT) console.log('Desktop Client Web Sockets Interface ......................................... Listening at port ' + JSON.parse(DK.desktopApp.p2pNetworkClient.node.config).webSocketsPort)
thisObject.httpInterface = DK.projects.socialTrading.modules.httpInterface.newDesktopModulesHttpInterface() thisObject.httpInterface = DK.projects.socialTrading.modules.httpInterface.newDesktopModulesHttpInterface()
thisObject.httpInterface.initialize() thisObject.httpInterface.initialize()
console.log('Desktop Client Http Interface .............................................. Listening at port ' + global.env.DESKTOP_HTTP_INTERFACE_PORT) console.log('Desktop Client Http Interface ................................................ Listening at port ' + JSON.parse(DK.desktopApp.p2pNetworkClient.node.config).webPort)
} }
} }
} }
Environment.js
+3 -3
View File
@@ -12,11 +12,11 @@ exports.newEnvironment = function () {
BASE_PATH: basePath, BASE_PATH: basePath,
WEB_SERVER_URL: 'localhost', WEB_SERVER_URL: 'localhost',
PLATFORM_WEB_SOCKETS_INTERFACE_PORT: 18041, PLATFORM_WEB_SOCKETS_INTERFACE_PORT: 18041,
DESKTOP_WEB_SOCKETS_INTERFACE_PORT: 17042, NETWORK_WEB_SOCKETS_INTERFACE_PORT: 17041,
NETWORK_WEB_SOCKETS_INTERFACE_PORT: 18042, DESKTOP_WEB_SOCKETS_INTERFACE_PORT: 16041,
DESKTOP_WEB_SOCKETS_INTERFACE_HOST: 'localhost', DESKTOP_WEB_SOCKETS_INTERFACE_HOST: 'localhost',
PLATFORM_HTTP_INTERFACE_PORT: 34248, PLATFORM_HTTP_INTERFACE_PORT: 34248,
DESKTOP_HTTP_INTERFACE_PORT: 34249, DESKTOP_HTTP_INTERFACE_PORT: 33248,
PATH_TO_DATA_STORAGE: path.join(basePath, './Platform/My-Data-Storage'), PATH_TO_DATA_STORAGE: path.join(basePath, './Platform/My-Data-Storage'),
PATH_TO_PROJECTS: path.join(basePath, './Projects'), PATH_TO_PROJECTS: path.join(basePath, './Projects'),
PATH_TO_LOG_FILES: path.join(basePath, './Platform/My-Log-Files'), PATH_TO_LOG_FILES: path.join(basePath, './Platform/My-Log-Files'),
Network/NetwokNode.js
+1 -1
View File
@@ -64,7 +64,7 @@ exports.newNetworkNode = function newNetworkNode() {
*/ */
thisObject.webSocketsInterface = NT.projects.network.modules.webSocketsInterface.newNetworkModulesWebSocketsInterface() thisObject.webSocketsInterface = NT.projects.network.modules.webSocketsInterface.newNetworkModulesWebSocketsInterface()
thisObject.webSocketsInterface.initialize() thisObject.webSocketsInterface.initialize()
console.log('Network Node Web Sockets Interface ....................................... Listening at port ' + JSON.parse(NT.networkNode.p2pNetworkNode.node.config).webSocketsPort) console.log('Network Node Web Sockets Interface ........................................... Listening at port ' + JSON.parse(NT.networkNode.p2pNetworkNode.node.config).webSocketsPort)
} }
} }
} }
Projects/Governance/Plugins/User-Profiles/Luis-Fernando-Molina.json
+3 -3
View File
@@ -17012,7 +17012,7 @@
"signingAccountChild": { "signingAccountChild": {
"type": "Social Trading Desktop App", "type": "Social Trading Desktop App",
"name": "Social Trading Desktop App # 1", "name": "Social Trading Desktop App # 1",
"config": "{\n \"codeName\": \"Social-Trading-Desktop-App-1\",\n \"host\": \"localhost\",\n \"webSocketsPort\": \"17042\"\n}", "config": "{\n \"codeName\": \"Social-Trading-Desktop-App-1\",\n \"host\": \"localhost\",\n \"webPort\": \"33248\",\n \"webSocketsPort\": \"17042\"\n}",
"project": "Governance", "project": "Governance",
"id": "012c74dd-1a61-4784-bc8a-e18555b4974e", "id": "012c74dd-1a61-4784-bc8a-e18555b4974e",
"savedPayload": { "savedPayload": {
@@ -17404,7 +17404,7 @@
"signingAccountChild": { "signingAccountChild": {
"type": "Social Trading Desktop App", "type": "Social Trading Desktop App",
"name": "Social Trading Desktop App # 2", "name": "Social Trading Desktop App # 2",
"config": "{\n \"codeName\": \"Social-Trading-Desktop-App-2\",\n \"host\": \"localhost\",\n \"webSocketsPort\": \"17042\"\n}", "config": "{\n \"codeName\": \"Social-Trading-Desktop-App-2\",\n \"host\": \"localhost\",\n \"webPort\": \"33249\",\n \"webSocketsPort\": \"17043\"\n}",
"project": "Governance", "project": "Governance",
"id": "e6f2b6f6-5e40-42d2-92d8-fdd17680a1c7", "id": "e6f2b6f6-5e40-42d2-92d8-fdd17680a1c7",
"savedPayload": { "savedPayload": {
@@ -17460,7 +17460,7 @@
"signingAccountChild": { "signingAccountChild": {
"type": "Social Trading Desktop App", "type": "Social Trading Desktop App",
"name": "Social Trading Desktop App # 3", "name": "Social Trading Desktop App # 3",
"config": "{\n \"codeName\": \"Social-Trading-Desktop-App-3\",\n \"host\": \"localhost\",\n \"webSocketsPort\": \"17042\"\n}", "config": "{\n \"codeName\": \"Social-Trading-Desktop-App-3\",\n \"host\": \"localhost\",\n \"webPort\": \"33250\",\n \"webSocketsPort\": \"17044\"\n}",
"project": "Governance", "project": "Governance",
"id": "00ca860e-bb19-42b4-8bce-b67f9a1f9af7", "id": "00ca860e-bb19-42b4-8bce-b67f9a1f9af7",
"savedPayload": { "savedPayload": {
Projects/Governance/Schemas/App-Schema/social-trading-desktop-app.json
+1 -1
View File
@@ -25,7 +25,7 @@
"config": true "config": true
}, },
"initialValues": { "initialValues": {
"config": "{ \n\"codeName\": \"localhost\", \n\"host\": \"localhost\", \n\"webSocketsPort\": \"17042\"\n}" "config": "{ \n\"codeName\": \"localhost\", \n\"host\": \"localhost\", \n\"webPort\": \"34248\", \n\"webSocketsPort\": \"17042\"\n}"
}, },
"addLeftIcons": true, "addLeftIcons": true,
"level": 1, "level": 1,
Projects/Network/SA/Modules/WebSocketsNetworkClient.js
+1 -1
View File
@@ -223,7 +223,7 @@ exports.newNetworkModulesWebSocketsNetworkClient = function newNetworkModulesWeb
function onConnectionClosed() { function onConnectionClosed() {
if (thisObject.isConnected === true) { if (thisObject.isConnected === true) {
console.log('Websockets Client Disconnected from Network Node via Web Sockets ......... Disconnected from ' + thisObject.p2pNetworkNode.userProfile.userProfileHandle + ' -> ' + thisObject.p2pNetworkNode.node.name + ' -> ' + thisObject.host + ':' + thisObject.port) console.log('Websockets Client Disconnected from Network Node via Web Sockets ............. Disconnected from ' + thisObject.p2pNetworkNode.userProfile.userProfileHandle + ' -> ' + thisObject.p2pNetworkNode.node.name + ' -> ' + thisObject.host + ':' + thisObject.port)
} }
if (thisObject.onConnectionClosedCallBack !== undefined) { if (thisObject.onConnectionClosedCallBack !== undefined) {
thisObject.onConnectionClosedCallBack(thisObject.id) thisObject.onConnectionClosedCallBack(thisObject.id)
Projects/Social-Trading/DK/modules/WebSocketsInterface.js
+4 -2
View File
@@ -22,7 +22,9 @@ exports.newDesktopModulesWebSocketsInterface = function newDesktopModulesWebSock
} }
function initialize() { function initialize() {
socketServer = new SA.nodeModules.ws.Server({ port: global.env.DESKTOP_WEB_SOCKETS_INTERFACE_PORT }) let port = JSON.parse(DK.desktopApp.p2pNetworkClient.node.config).webSocketsPort
socketServer = new SA.nodeModules.ws.Server({ port: port })
webAppInterface = DK.projects.socialTrading.modules.webAppInterface.newSocialTradingModulesWebAppInterface() webAppInterface = DK.projects.socialTrading.modules.webAppInterface.newSocialTradingModulesWebAppInterface()
setUpWebSocketServer() setUpWebSocketServer()
@@ -45,7 +47,7 @@ exports.newDesktopModulesWebSocketsInterface = function newDesktopModulesWebSock
webApp = { webApp = {
socket: socket socket: socket
} }
console.log('Desktop Web App Connected to Web Sockets Interface ......................... Connected to port ' + global.env.DESKTOP_WEB_SOCKETS_INTERFACE_PORT) console.log('Desktop Web App Connected to Web Sockets Interface ............................. Connected to port ' + global.env.DESKTOP_WEB_SOCKETS_INTERFACE_PORT)
webApp.socket.on('close', onConnectionClosed) webApp.socket.on('close', onConnectionClosed)
webApp.socket.on('message', onMenssage) webApp.socket.on('message', onMenssage)
Projects/Social-Trading/DK/modules/httpInterface.js
+3 -2
View File
@@ -15,15 +15,16 @@ exports.newDesktopModulesHttpInterface = function newDesktopModulesHttpInterface
} }
function initialize() { function initialize() {
let port = JSON.parse(DK.desktopApp.p2pNetworkClient.node.config).webPort
/* /*
We will create an HTTP Server and leave it running forever. We will create an HTTP Server and leave it running forever.
*/ */
SA.nodeModules.http.createServer(onHttpRequest).listen(global.env.DESKTOP_HTTP_INTERFACE_PORT) SA.nodeModules.http.createServer(onHttpRequest).listen(port)
/* Starting the browser now is optional */ /* Starting the browser now is optional */
if (process.argv.includes("noBrowser")) { if (process.argv.includes("noBrowser")) {
//Running Client only with no UI. //Running Client only with no UI.
} else { } else {
SA.nodeModules.open('http://localhost:' + global.env.DESKTOP_HTTP_INTERFACE_PORT) SA.nodeModules.open('http://localhost:' + port)
} }
} }