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

Merge pull request #92 from AmateurAudioDude/fixes/v1.3.1-mono-stereo

Browse Source 
Mono/Stereo symbol
This commit is contained in:
Marek Farkaš
2024-10-10 20:23:49 +02:00
committed by GitHub
parent 36b0e99c59 988e2739a7
commit 6c4b654e2d
1 changed files with 64 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
web/js/main.js
View File

@@ -6,6 +6,10 @@ var parsedData, signalChart, previousFreq;
var signalData = [];
var data = [];
let updateCounter = 0;
let messageCounter = 0; // Count for WebSocket data length returning 0
let messageData = 800; // Initial value anything above 0
let messageLength = 800; // Retain value of messageData until value is updated
let pingTimeLimit = false; // WebSocket becomes unresponsive with high ping
const europe_programmes = [
"No PTY", "News", "Current Affairs", "Info",
@@ -254,18 +258,66 @@ function getServerTime() {
}
function sendPingRequest() {
const timeoutDuration = 15000; // Ping response can become buggy if it exceeds 20 seconds
const startTime = new Date().getTime();
fetch('./ping')
const fetchWithTimeout = (url, options, timeout = timeoutDuration) => {
return new Promise((resolve, reject) => {
const timerTimeout = setTimeout(() => {
reject(new Error('Request timed out'));
}, timeout);
fetch(url, options)
.then(response => {
clearTimeout(timerTimeout);
resolve(response);
})
.catch(error => {
clearTimeout(timerTimeout);
reject(error);
});
});
};
fetchWithTimeout('./ping', { cache: 'no-store' }, timeoutDuration)
.then(response => {
const endTime = new Date().getTime();
const pingTime = endTime - startTime;
$('#current-ping').text(`Ping: ${pingTime}ms`);
pingTimeLimit = false;
})
.catch(error => {
console.error('Error fetching ping:', error);
console.warn('Ping request failed');
$('#current-ping').text(`Ping: unknown`);
if (!pingTimeLimit) { // Force reconnection as WebSocket could be unresponsive even though it's reported as OPEN
if (messageLength === 0) window.socket.close(1000, 'Normal closure');
if (connectionLost) sendToast('warning', 'Connection lost', 'Attempting to reconnect...', false, false);
console.log("Reconnecting due to high ping...");
pingTimeLimit = true;
}
});
function handleMessage(message) {
messageData = JSON.parse(message.data.length);
socket.removeEventListener('message', handleMessage);
}
socket.addEventListener('message', handleMessage);
messageLength = messageData;
messageData = 0;
// Force reconnection if no WebSocket data after several queries
if (messageLength === 0) {
messageCounter++;
if (messageCounter === 5) {
messageCounter = 0;
window.socket.close(1000, 'Normal closure');
if (connectionLost) sendToast('warning', 'Connection lost', 'Attempting to reconnect...', false, false);
console.log("Reconnecting due to no data received...");
}
} else {
messageCounter = 0;
}
// Automatic reconnection on WebSocket close
if (socket.readyState === WebSocket.CLOSED || socket.readyState === WebSocket.CLOSING) {
socket = new WebSocket(socketAddress);
@@ -845,7 +897,16 @@ const updateDataElements = throttle(function(parsedData) {
}
if(parsedData.stForced) {
if (!parsedData.st) {
stereoColor = 'gray';
} else {
stereoColor = 'var(--color-4)';
}
$('.data-st.circle1').css('left', '4px');
$('.data-st.circle2').css('display', 'none');
} else {
$('.data-st.circle1').css('left', '0px');
$('.data-st.circle2').css('display', 'block');
}
$dataSt.css('border', '2px solid ' + stereoColor);