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

Fix PS exact match and update TX DB every 7 days

Browse Source
This commit is contained in:
Adam Wisher
2026-02-24 09:18:06 +01:00
committed by KubaPro010
parent 03ff93cd39
commit 098b6ba4e9
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/console.js
View File

@@ -30,10 +30,10 @@ const getCurrentTime = () => {
const removeANSIEscapeCodes = (str) => str.replace(ANSI_ESCAPE_CODE_PATTERN, ''); // Strip ANSI escape codes from a string const removeANSIEscapeCodes = (str) => str.replace(ANSI_ESCAPE_CODE_PATTERN, ''); // Strip ANSI escape codes from a string
const logMessage = (type, messages, verbose = false) => { const logMessage = (type, messages) => {
const logMessage = `${getCurrentTime()} ${MESSAGE_PREFIX[type]} ${messages.join(' ')}`; const logMessage = `${getCurrentTime()} ${MESSAGE_PREFIX[type]} ${messages.join(' ')}`;
if (type === 'DEBUG' && verboseMode || type === 'FFMPEG' && verboseModeFfmpeg || type !== 'DEBUG' && type !== 'FFMPEG') { if ((type === 'DEBUG' && verboseMode) || (type === 'FFMPEG' && verboseModeFfmpeg) || type !== 'DEBUG' && type !== 'FFMPEG') {
logs.push(logMessage); logs.push(logMessage);
if (logs.length > maxConsoleLogLines) logs.shift(); if (logs.length > maxConsoleLogLines) logs.shift();
console.log(logMessage); console.log(logMessage);
@@ -42,7 +42,7 @@ const logMessage = (type, messages, verbose = false) => {
if(type !== 'FFMPEG') appendLogToBuffer(logMessage); if(type !== 'FFMPEG') appendLogToBuffer(logMessage);
}; };
const logDebug = (...messages) => logMessage('DEBUG', messages, verboseMode); const logDebug = (...messages) => logMessage('DEBUG', messages);
const logChat = (message) => logMessage('CHAT', [`${message.nickname} (${message.ip}) sent a chat message: ${message.message}`]); const logChat = (message) => logMessage('CHAT', [`${message.nickname} (${message.ip}) sent a chat message: ${message.message}`]);
const logError = (...messages) => logMessage('ERROR', messages); const logError = (...messages) => logMessage('ERROR', messages);
const logFfmpeg = (...messages) => logMessage('FFMPEG', messages, verboseModeFfmpeg); const logFfmpeg = (...messages) => logMessage('FFMPEG', messages, verboseModeFfmpeg);

8
server/index.js
View File

@@ -81,11 +81,11 @@ const terminalWidth = readline.createInterface({
// Couldn't get figlet.js or something like that? // Couldn't get figlet.js or something like that?
console.log(`\x1b[32m console.log(`\x1b[32m
_____ __ __ ______ __ __ __ _ _____ __ __ ______ __ __ __ _
| ___| \\/ | | _ \\ \\/ / \\ \\ / /__| |__ ___ ___ _ ____ _____ _ __ | ___| \\/ | | _ \\ \\/ / \\ \\ / /__| |__ ___ ___ _ ____ _____ _ __
| |_ | |\\/| |_____| | | \\ / \\ \\ /\\ / / _ \\ '_ \\/ __|/ _ \\ '__\\ \\ / / _ \\ '__| | |_ | |\\/| |_____| | | \\ / \\ \\ /\\ / / _ \\ '_ \\/ __|/ _ \\ '__\\ \\ / / _ \\ '__|
| _| | | | |_____| |_| / \\ \\ V V / __/ |_) \\__ \\ __/ | \\ V / __/ | | _| | | | |_____| |_| / \\ \\ V V / __/ |_) \\__ \\ __/ | \\ V / __/ |
|_| |_| |_| |____/_/\\_\\ \\_/\\_/ \\___|_.__/|___/\\___|_| \\_/ \\___|_| |_| |_| |_| |____/_/\\_\\ \\_/\\_/ \\___|_.__/|___/\\___|_| \\_/ \\___|_|
`); `);
console.log('\x1b[32m\x1b[2mby Noobish @ \x1b[4mFMDX.org\x1b[0m'); console.log('\x1b[32m\x1b[2mby Noobish @ \x1b[4mFMDX.org\x1b[0m');
console.log("v" + pjson.version) console.log("v" + pjson.version)

18
server/tx_search.js
View File

@@ -3,6 +3,9 @@ const { serverConfig } = require('./server_config');
const consoleCmd = require('./console'); const consoleCmd = require('./console');
let localDb = {}; let localDb = {};
let nextLocalDbUpdate = 0;
const localDbUpdateInterval = 7 * 24 * 60 * 60 * 1000; // 7-day database update interval
let awaitingTxInfo = true;
let lastFetchTime = 0; let lastFetchTime = 0;
let piFreqIndex = {}; // Indexing for speedier PI+Freq combinations let piFreqIndex = {}; // Indexing for speedier PI+Freq combinations
const fetchInterval = 1000; const fetchInterval = 1000;
@@ -71,7 +74,7 @@ if (serverConfig.identification.gpsMode) {
// Function to build local TX database from FMDX Maps endpoint. // Function to build local TX database from FMDX Maps endpoint.
async function buildTxDatabase() { async function buildTxDatabase() {
if (Latitude.length > 0 && Longitude.length > 0) { if (Latitude.length > 0 && Longitude.length > 0) {
let awaitingTxInfo = true; awaitingTxInfo = true;
while (awaitingTxInfo) { while (awaitingTxInfo) {
try { try {
consoleCmd.logInfo('Fetching transmitter database...'); consoleCmd.logInfo('Fetching transmitter database...');
@@ -240,6 +243,10 @@ async function fetchTx(freq, piCode, rdsPs) {
let match = null; let match = null;
let multiMatches = []; let multiMatches = [];
const now = Date.now(); const now = Date.now();
if (now > nextLocalDbUpdate && !awaitingTxInfo) {
consoleCmd.logInfo('Time to update transmitter database.');
buildTxDatabase();
}
freq = parseFloat(freq); freq = parseFloat(freq);
if ( if (
@@ -265,6 +272,15 @@ async function fetchTx(freq, piCode, rdsPs) {
stations: [station] stations: [station]
})); }));
if (filteredLocations.length > 1) {
const extraFilteredLocations = filteredLocations.map(locData => ({
...locData,
stations: locData.stations.filter(station => (station.ps.toLowerCase() === rdsPs.replace(/ /g, '_').toLowerCase()))
})).filter(locData => locData.stations.length > 0);
if (extraFilteredLocations.length > 0) filteredLocations = extraFilteredLocations;
}
// Only check PS if we have more than one match. // Only check PS if we have more than one match.
if (filteredLocations.length > 1) { if (filteredLocations.length > 1) {
filteredLocations = filteredLocations.map(locData => ({ filteredLocations = filteredLocations.map(locData => ({