diff --git a/languages/en_CA.json b/languages/en_CA.json index fa1ff459..a0ae5ff8 100644 --- a/languages/en_CA.json +++ b/languages/en_CA.json @@ -55,6 +55,9 @@ "Time-lapse": "Time-lapse", "Montage": "Montage", "Registered": "Registered", + "Viewing Server Stats": "Viewing Server Stats", + "Connected Users": "Connected Users", + "Registered Servers": "Registered Servers", "Open All Monitors": "Open All Monitors", "Accounts": "Accounts", "Settings": "Settings", diff --git a/libs/commander/worker.js b/libs/commander/worker.js index 89f2f22c..a0e4bc4b 100644 --- a/libs/commander/worker.js +++ b/libs/commander/worker.js @@ -25,7 +25,7 @@ parentPort.on('message',(data) => { initialize(data.config,data.lang) break; case'exit': - s.debugLog('Exiting...') + s.debugLog('Closing P2P Connection...') process.exit(0) break; } @@ -153,6 +153,7 @@ const initialize = (config,lang) => { auth: user.auth_token, ke: user.ke, uid: user.uid, + ipAddress: rawRequest.ipAddress }) }); ([ diff --git a/web/libs/js/super.easyRemoteAccess.js b/web/libs/js/super.easyRemoteAccess.js index 7c8c2046..c2eef8a6 100644 --- a/web/libs/js/super.easyRemoteAccess.js +++ b/web/libs/js/super.easyRemoteAccess.js @@ -32,6 +32,9 @@ $(document).ready(function(){ var cpuCoresEl = cardEl.find('.cpuCores') var networkUseDownEl = cardEl.find('.networkUseDown') var networkUseUpEl = cardEl.find('.networkUseUp') + var chartViewerCount = cardEl.find('.chartViewerCount') + var connectedUsers = cardEl.find('.connectedUsers') + var registeredServers = cardEl.find('.registeredServers') var socketConnection = io(`ws://${server.host}:${server.p2pPort}`,{ transports: ['websocket'], query: { @@ -48,6 +51,9 @@ $(document).ready(function(){ cpuUsageEl.text(data.cpu) ramUsedEl.text(data.ram.used) ramPercentEl.text(data.ram.percent) + registeredServers.text(data.servers) + connectedUsers.text(data.users) + chartViewerCount.text(data.statViewers) }) } function disableForm(){ diff --git a/web/pages/blocks/easyRemoteAccess.ejs b/web/pages/blocks/easyRemoteAccess.ejs index 267b41b6..61272bfc 100644 --- a/web/pages/blocks/easyRemoteAccess.ejs +++ b/web/pages/blocks/easyRemoteAccess.ejs @@ -98,6 +98,21 @@ <%- lang.RAM %> %, MB + + + <%- lang['Registered Servers'] %> + + + + + <%- lang['Connected Users'] %> + + + + + <%- lang['Viewing Server Stats'] %> + +