From 42a20330af75d0b09e256f6831c4bd7f8378290e Mon Sep 17 00:00:00 2001 From: KubaPro010 Date: Tue, 24 Feb 2026 22:28:04 +0100 Subject: [PATCH] credit? --- server/index.js | 12 ++++++------ server/tx_search.js | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/server/index.js b/server/index.js index fd4a6df..119e99d 100644 --- a/server/index.js +++ b/server/index.js @@ -26,7 +26,7 @@ const pluginsApi = require('./plugins_api'); const pjson = require('../package.json'); const client = new net.Socket(); -const wss = new WebSocket.Server({ noServer: true, perMessageDeflate: true }); +const wss = new WebSocket.Server({ noServer: true }); const rdsWss = new WebSocket.Server({ noServer: true }); const pluginsWss = new WebSocket.Server({ noServer: true, perMessageDeflate: true }); @@ -46,7 +46,7 @@ const terminalWidth = readline.createInterface({ }).output.columns; console.log('\x1b[32m' + figlet.textSync("FM-DX Webserver")); -console.log('\x1b[32m\x1b[2mby Noobish @ \x1b[4mFMDX.org\x1b[0m'); +console.log('\x1b[32m\x1b[2mby Noobish @ \x1b[4mFMDX.org + KubaPro010\x1b[0m'); console.log("v" + pjson.version) console.log('\x1b[90m' + '─'.repeat(terminalWidth - 1) + '\x1b[0m'); @@ -458,10 +458,10 @@ wss.on('connection', (ws, request) => { } if (tunerLockTracker.has(ws)) { - logInfo(`User who locked the tuner left. Unlocking the tuner.`); - output.write('wT0\n') - tunerLockTracker.delete(ws); - serverConfig.publicTuner = true; + logInfo(`User who locked the tuner left. Unlocking the tuner.`); + output.write('wT0\n') + tunerLockTracker.delete(ws); + serverConfig.publicTuner = true; } if (currentUsers === 0 && serverConfig.enableDefaultFreq === true && diff --git a/server/tx_search.js b/server/tx_search.js index d2cbc27..fffee7c 100644 --- a/server/tx_search.js +++ b/server/tx_search.js @@ -182,7 +182,7 @@ function getStateForCoordinates(lat, lon) { */ function validPsCompare(rdsPs, stationPs) { if (typeof stationPs !== 'string' || typeof rdsPs !== 'string') { - consoleCmd.logError(`Invalid TX values. stationPs: ${stationPs}, rdsPs: ${rdsPs}`); + consoleCmd.logDebug(`Invalid TX values. stationPs: ${stationPs}, rdsPs: ${rdsPs}`); return false; } @@ -257,15 +257,6 @@ async function fetchTx(freq, piCode, rdsPs) { 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. if (filteredLocations.length > 1) { filteredLocations = filteredLocations.map(locData => ({ @@ -273,6 +264,15 @@ async function fetchTx(freq, piCode, rdsPs) { stations: locData.stations.filter(station => validPsCompare(rdsPs, station.ps)) })).filter(locData => locData.stations.length > 0); } + + 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; + } for (let loc of filteredLocations) { loc = Object.assign(loc, loc.stations[0]);