diff --git a/server/datahandler.js b/server/datahandler.js index ff75392..abf3416 100644 --- a/server/datahandler.js +++ b/server/datahandler.js @@ -1,5 +1,5 @@ /* Libraries / Imports */ -const send_to_xrd = require('./xrd_server'); +const { send_xrd_online } = require('./xrd_server'); const RDSDecoder = require("./rds.js"); const { serverConfig } = require('./server_config'); @@ -274,7 +274,7 @@ checkSerialPortStatus(); function showOnlineUsers(currentUsers) { dataToSend.users = currentUsers; initialData.users = currentUsers; - send_to_xrd(`o${currentUsers},0\n`); + send_xrd_online(currentUsers); } let prevFreq = initialData.freq || '87.500'; diff --git a/server/helpers.js b/server/helpers.js index 45d9d3d..d2bd5c9 100644 --- a/server/helpers.js +++ b/server/helpers.js @@ -7,7 +7,7 @@ const dataHandler = require('./datahandler'); const storage = require('./storage'); const consoleCmd = require('./console'); const { serverConfig, configSave } = require('./server_config'); -const send_to_xrd = require("./xrd_server") +const { send_to_xrd } = require("./xrd_server") let geoip = null; try { diff --git a/server/xrd_server.js b/server/xrd_server.js index cd9fa53..a6e79af 100644 --- a/server/xrd_server.js +++ b/server/xrd_server.js @@ -10,6 +10,10 @@ function send_to_xrd(data) { }); } +function send_xrd_online(fmusers) { + send_to_xrd(`o${currentUsers},${fmusers}\n`); +} + xrd.on('connection', (ws, request) => { const { initialData } = require('./datahandler'); const { isAdminAuthenticated } = request.session || {}; @@ -37,4 +41,4 @@ xrd.on('connection', (ws, request) => { storage.websocket_delegation.set("/xrd", xrd); -module.exports = send_to_xrd; \ No newline at end of file +module.exports = { send_to_xrd, send_xrd_online}; \ No newline at end of file