kuba/fm-dx-webserver
1
0
Fork 0
mirror of https://github.com/KubaPro010/fm-dx-webserver.git synced 2026-02-26 22:13:53 +01:00
Code Issues Activity

bugfix pack, server logs

Browse Source
This commit is contained in:
NoobishSVK
2024-03-28 22:44:24 +01:00
parent 7f483770f2
commit 298a868ef7
13 changed files with 147 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
server/console.js
View File

@@ -1,6 +1,11 @@
const fs = require('fs');
const verboseMode = process.argv.includes('--debug');
const verboseModeFfmpeg = process.argv.includes('--ffmpegdebug');
const ANSI_ESCAPE_CODE_PATTERN = /\x1b\[[0-9;]*m/g;
const MAX_LOG_LINES = 100000;
const getCurrentTime = () => {
const currentTime = new Date();
const hours = currentTime.getHours().toString().padStart(2, '0');
@@ -8,7 +13,12 @@ const getCurrentTime = () => {
return `\x1b[90m[${hours}:${minutes}]\x1b[0m`;
};
const removeANSIEscapeCodes = (str) => {
return str.replace(ANSI_ESCAPE_CODE_PATTERN, '');
};
const MESSAGE_PREFIX = {
CHAT: "\x1b[36m[CHAT]\x1b[0m",
DEBUG: "\x1b[36m[DEBUG]\x1b[0m",
ERROR: "\x1b[31m[ERROR]\x1b[0m",
FFMPEG: "\x1b[36m[FFMPEG]\x1b[0m",
@@ -21,14 +31,20 @@ const logs = [];
const maxLogLines = 250;
const logDebug = (...messages) => {
const logMessage = `${getCurrentTime()} ${MESSAGE_PREFIX.DEBUG} ${messages.join(' ')}`;
if (verboseMode) {
const logMessage = `${getCurrentTime()} ${MESSAGE_PREFIX.DEBUG} ${messages.join(' ')}`;
logs.push(logMessage);
if (logs.length > maxLogLines) {
logs.shift();
}
console.log(logMessage);
}
appendLogToFile(logMessage);
};
const logChat = (...messages) => {
const logMessage = `${getCurrentTime()} ${MESSAGE_PREFIX.CHAT} ${messages[0].nickname} (${messages[0].ip}) sent a chat message: ${messages[0].message}`;
appendLogToFile(logMessage);
};
const logError = (...messages) => {
@@ -38,6 +54,7 @@ const logError = (...messages) => {
logs.shift();
}
console.log(logMessage);
appendLogToFile(logMessage);
};
const logFfmpeg = (...messages) => {
@@ -48,6 +65,7 @@ const logFfmpeg = (...messages) => {
logs.shift();
}
console.log(logMessage);
appendLogToFile(logMessage);
}
};
@@ -58,6 +76,7 @@ const logInfo = (...messages) => {
logs.shift();
}
console.log(logMessage);
appendLogToFile(logMessage);
};
const logWarn = (...messages) => {
@@ -67,8 +86,36 @@ const logWarn = (...messages) => {
logs.shift();
}
console.log(logMessage);
appendLogToFile(logMessage);
};
function appendLogToFile(logMessage) {
const cleanLogMessage = removeANSIEscapeCodes(logMessage);
fs.appendFile('serverlog.txt', cleanLogMessage + '\n', (err) => {
if (err) {
console.error('Error writing to server log:', err);
} else {
fs.readFile('serverlog.txt', 'utf8', (err, data) => {
if (err) {
console.error('Error reading server log:', err);
} else {
const lineCount = data.split('\n').length;
if (lineCount > MAX_LOG_LINES) {
const excessLines = lineCount - MAX_LOG_LINES;
const truncatedContent = data.split('\n').slice(excessLines).join('\n');
fs.writeFile('serverlog.txt', truncatedContent, (err) => {
if (err) {
console.error('Error truncating server log:', err);
}
});
}
}
});
}
});
}
module.exports = {
logError, logDebug, logFfmpeg, logInfo, logWarn, logs
logError, logDebug, logFfmpeg, logInfo, logWarn, logs, logChat
};

17
server/datahandler.js
View File

@@ -272,6 +272,8 @@ function handleData(ws, receivedData) {
modifiedData = receivedLine.substring(1).split(",")[0];
if((modifiedData / 1000).toFixed(3) == dataToSend.freq) {
resetToDefault(dataToSend);
rdsparser.clear(rds);
return; // Prevent tune spamming using scrollwheel
}
@@ -386,13 +388,18 @@ function processSignal(receivedData, st, stForced) {
initialData.st_forced = stForced;
if (!isNaN(parsedValue)) {
dataToSend.signal = parsedValue.toFixed(2);
initialData.signal = parsedValue.toFixed(2);
// Convert parsedValue to a number
var signal = parseFloat(parsedValue.toFixed(2));
dataToSend.signal = signal;
initialData.signal = signal;
if(dataToSend.signal > dataToSend.highestSignal) {
dataToSend.highestSignal = dataToSend.signal;
// Convert highestSignal to a number for comparison
var highestSignal = parseFloat(dataToSend.highestSignal);
if (signal > highestSignal) {
dataToSend.highestSignal = signal.toString(); // Convert back to string for consistency
}
}
}
}
module.exports = {

4
server/endpoints.js
View File

@@ -61,6 +61,10 @@ router.get('/', (req, res) => {
}
});
router.get('/403', (req, res) => {
res.render('403');
})
router.get('/wizard', (req, res) => {
let serialPorts;

33
server/index.js
View File

@@ -21,9 +21,9 @@ const { SerialPort } = require('serialport')
const helpers = require('./helpers');
const dataHandler = require('./datahandler');
const fmdxList = require('./fmdx_list');
const { logDebug, logError, logInfo, logWarn } = require('./console');
const { logDebug, logError, logInfo, logWarn, logChat } = require('./console');
const storage = require('./storage');
const { configName, serverConfig, configUpdate, configSave } = require('./server_config');
const { serverConfig } = require('./server_config');
const pjson = require('../package.json');
console.log(`\x1b[32m
@@ -70,19 +70,10 @@ function connectToSerial() {
serialport.on('open', () => {
logInfo('Using COM device: ' + serverConfig.xdrd.comPort);
serialport.write('x\n');
serialport.write('W0\n');
serialport.write('M0\n');
serverConfig.audio.startupVolume ? serialport.write('Y' + (serverConfig.audio.startupVolume * 100).toFixed(0) + '\n') : serialport.write('Y100\n');
serialport.write('D0\n');
serialport.write('A0\n');
serialport.write('F-1\n');
serialport.write('Z0\n');
serialport.write('G11\n');
serialport.write('V0\n');
serialport.write('Q0\n');
serialport.write('C0\n');
serialport.write('I0,0\n');
serialport.write('M0\n');
serialport.write('Z0\n');
if(serverConfig.defaultFreq && serverConfig.enableDefaultFreq === true) {
serialport.write('T' + Math.round(serverConfig.defaultFreq * 1000) +'\n');
dataHandler.initialData.freq = Number(serverConfig.defaultFreq).toFixed(3);
@@ -90,6 +81,13 @@ function connectToSerial() {
} else {
serialport.write('T87500\n');
}
serialport.write('A0\n');
serialport.write('F-1\n');
serialport.write('W0\n');
serialport.write('D0\n');
serialport.write('G11\n');
serverConfig.audio.startupVolume ? serialport.write('Y' + (serverConfig.audio.startupVolume * 100).toFixed(0) + '\n') : serialport.write('Y100\n');
serialport.on('data', (data) => {
helpers.resolveDataBuffer(data, wss);
@@ -158,11 +156,11 @@ function connectToXdrd() {
dataHandler.dataToSend.ant = modifiedLine;
}
if (authFlags.authMsg && authFlags.firstClient) {
if (authFlags.authMsg === true && authFlags.firstClient === true) {
client.write('x\n');
client.write(serverConfig.defaultFreq && serverConfig.enableDefaultFreq === true ? 'T' + Math.round(serverConfig.defaultFreq * 1000) + '\n' : 'T87500\n');
dataHandler.initialData.freq = serverConfig.defaultFreq && serverConfig.enableDefaultFreq === true ? (serverConfig.defaultFreq).toFixed(3) : (87.5).toFixed(3);
dataHandler.dataToSend.freq = serverConfig.defaultFreq && serverConfig.enableDefaultFreq === true ? (serverConfig.defaultFreq).toFixed(3) : (87.5).toFixed(3);
dataHandler.initialData.freq = serverConfig.defaultFreq && serverConfig.enableDefaultFreq === true ? Number(serverConfig.defaultFreq).toFixed(3) : (87.5).toFixed(3);
dataHandler.dataToSend.freq = serverConfig.defaultFreq && serverConfig.enableDefaultFreq === true ? Number(serverConfig.defaultFreq).toFixed(3) : (87.5).toFixed(3);
client.write('A0\n');
client.write(serverConfig.audio.startupVolume ? 'Y' + (serverConfig.audio.startupVolume * 100).toFixed(0) + '\n' : 'Y100\n');
client.off('data', authDataHandler);
@@ -406,6 +404,7 @@ chatWss.on('connection', (ws, request) => {
if (storage.chatHistory.length > 50) {
storage.chatHistory.shift();
}
logChat(messageData);
const modifiedMessage = JSON.stringify(messageData);