diff --git a/package.json b/package.json index 266673a..aee9f75 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fm-dx-webserver", - "version": "1.2.1", + "version": "1.2.2", "description": "FM DX Webserver", "main": "index.js", "scripts": { diff --git a/server/endpoints.js b/server/endpoints.js index 758e41a..2a588b6 100644 --- a/server/endpoints.js +++ b/server/endpoints.js @@ -160,6 +160,7 @@ router.get('/logout', (req, res) => { router.get('/kick', (req, res) => { const ipAddress = req.query.ip; // Extract the IP address parameter from the query string // Terminate the WebSocket connection for the specified IP address + console.log(ipAddress); if(req.session.isAdminAuthenticated) { helpers.kickClient(ipAddress); } diff --git a/server/helpers.js b/server/helpers.js index 6c27aa9..8709173 100644 --- a/server/helpers.js +++ b/server/helpers.js @@ -84,6 +84,7 @@ function resolveDataBuffer(data, wss) { function kickClient(ipAddress) { // Find the entry in connectedClients associated with the provided IP address const targetClient = storage.connectedUsers.find(client => client.ip === ipAddress); + console.log(storage.connectedUsers); if (targetClient && targetClient.instance) { // Send a termination message to the client targetClient.instance.send('KICK'); diff --git a/server/index.js b/server/index.js index 782abb1..c803fe5 100644 --- a/server/index.js +++ b/server/index.js @@ -259,7 +259,7 @@ wss.on('connection', (ws, request) => { logInfo(`Web client \x1b[32mconnected\x1b[0m (${clientIp}) \x1b[90m[${currentUsers}]\x1b[0m`); } else { const userLocation = `${locationInfo.city}, ${locationInfo.region}, ${locationInfo.country}`; - const userData = { ip: clientIp, location: userLocation, time: connectionTime }; + const userData = { ip: clientIp, location: userLocation, time: connectionTime, instance: ws }; storage.connectedUsers.push(userData); logInfo(`Web client \x1b[32mconnected\x1b[0m (${clientIp}) \x1b[90m[${currentUsers}]\x1b[0m Location: ${locationInfo.city}, ${locationInfo.region}, ${locationInfo.country}`); } @@ -338,6 +338,10 @@ wss.on('connection', (ws, request) => { storage.connectedUsers.splice(index, 1); // Remove the user's data from storage.connectedUsers array } + if(currentUsers === 0) { + storage.connectedUsers = []; + } + if (currentUsers === 0 && serverConfig.enableDefaultFreq === true && serverConfig.autoShutdown !== true && serverConfig.xdrd.wirelessConnection === true) { setTimeout(function() { if(currentUsers === 0) { diff --git a/web/css/panels.css b/web/css/panels.css index 0993861..455dff4 100644 --- a/web/css/panels.css +++ b/web/css/panels.css @@ -29,13 +29,10 @@ width: 88%; } - .panel-100 { width: 98%; } - - @media only screen and (max-width: 768px) { .panel-75 { width: 90%; diff --git a/web/index.ejs b/web/index.ejs index fa47a86..b8ef67b 100644 --- a/web/index.ejs +++ b/web/index.ejs @@ -39,8 +39,8 @@

<%= tunerName %> - <% if (!publicTuner) { %> - <% } if (tunerLock) { %> + <% if (!publicTuner) { %> + <% } if (tunerLock) { %> <% } %>

@@ -60,7 +60,7 @@

- +
@@ -143,9 +143,9 @@
- + - +
@@ -163,7 +163,7 @@ @@ -469,7 +469,7 @@
-
+
@@ -484,7 +484,7 @@
- +
diff --git a/web/js/3las/fallback/3las.fallback.js b/web/js/3las/fallback/3las.fallback.js index c272db5..81d123d 100644 --- a/web/js/3las/fallback/3las.fallback.js +++ b/web/js/3las/fallback/3las.fallback.js @@ -72,7 +72,7 @@ var Fallback = /** @class */ (function () { Fallback.prototype.Init = function (webSocket) { this.MobileUnmute(); this.WebSocket = webSocket; - this.WebSocket.Send(JSON.stringify({ + this.WebSocket?.Send(JSON.stringify({ "type": "fallback", "data": this.SelectedFormatName })); diff --git a/web/js/3las/main.js b/web/js/3las/main.js index dd0d195..4812bed 100644 --- a/web/js/3las/main.js +++ b/web/js/3las/main.js @@ -4,15 +4,17 @@ let Stream; function Init(_ev) { try { const settings = new _3LAS_Settings(); - Stream = new _3LAS(null, settings); + if (!Stream) { // Ensure Stream is not re-initialized + Stream = new _3LAS(null, settings); + } } catch (error) { console.log(error); return; } Stream.ConnectivityCallback = OnConnectivityCallback; - $(".playbutton").on('click', OnPlayButtonClick); - $("#volumeSlider").on("input", updateVolume); + $(".playbutton").off('click').on('click', OnPlayButtonClick); // Ensure only one event handler is attached + $("#volumeSlider").off("input").on("input", updateVolume); // Ensure only one event handler is attached } function OnConnectivityCallback(isConnected) { @@ -22,21 +24,20 @@ function OnConnectivityCallback(isConnected) { function OnPlayButtonClick(_ev) { const $playbutton = $('.playbutton'); $playbutton.find('.fa-solid').toggleClass('fa-play fa-stop'); - try { - if (Stream.ConnectivityFlag) { - Stream.Stop(); - } else { - Stream.Start(); - $playbutton.addClass('bg-gray').prop('disabled', true); - setTimeout(() => { - $playbutton.removeClass('bg-gray').prop('disabled', false); - }, 3000); - } - } catch (error) { - console.error(error); + + if (Stream.ConnectivityFlag) { + Stream.Stop(); + } else { + Stream.Start(); + $playbutton.addClass('bg-gray').prop('disabled', true); + setTimeout(() => { + $playbutton.removeClass('bg-gray').prop('disabled', false); + }, 3000); } } function updateVolume() { Stream.Volume = $(this).val(); } + +$(document).ready(Init); \ No newline at end of file diff --git a/web/js/chat.js b/web/js/chat.js index dbcdeda..50405cf 100644 --- a/web/js/chat.js +++ b/web/js/chat.js @@ -33,6 +33,7 @@ $(document).ready(function() { if (!messageData.history) { chatMessageCount++; chatMessagesCount.text(chatMessageCount); + chatMessagesCount.attr("aria-label", "Chat (" + chatMessageCount + " unread)"); chatButton.removeClass('bg-color-2').addClass('bg-color-4'); } } diff --git a/web/js/confighandler.js b/web/js/confighandler.js index e6d87f3..44ebedc 100644 --- a/web/js/confighandler.js +++ b/web/js/confighandler.js @@ -59,7 +59,7 @@ function submitData() { }).data('value') || "tef"); const softwareMode = $('#audio-software-mode').is(":checked") || false; - const startupVolume = $('#startup-volume').val() || '100'; + const startupVolume = $('#startup-volume').val() || '1'; const tunerName = $('#webserver-name').val() || 'FM Tuner'; const tunerDesc = $('#webserver-desc').val() || 'Default FM tuner description'; diff --git a/web/js/dropdown.js b/web/js/dropdown.js index b4ac1ba..a2598d9 100644 --- a/web/js/dropdown.js +++ b/web/js/dropdown.js @@ -25,13 +25,10 @@ const selectOption = (event) => { tuneTo(getCurrentFreq()); //Reset RDS when change antenna input break; case 'data-bw': - if($(event.currentTarget).attr('data-value') > 500) { - socket.send("F" + $(event.currentTarget).attr('data-value')); - } else { + legacyBwValue = $(event.currentTarget).attr('data-value2') || ""; + socket.send("F" + legacyBwValue); socket.send("W" + $(event.currentTarget).attr('data-value')); - } - - $currentDropdown.find('input').val($(event.currentTarget).text()); + $currentDropdown.find('input').val($(event.currentTarget).text()); break; default: $currentDropdown.find('input').val($(event.currentTarget).text()); diff --git a/web/js/init.js b/web/js/init.js index beaaf40..4d59700 100644 --- a/web/js/init.js +++ b/web/js/init.js @@ -1,9 +1,9 @@ -var currentDate = new Date('May 4, 2024 01:00:00'); +var currentDate = new Date('May 20, 2024 22:00:00'); var day = currentDate.getDate(); var month = currentDate.getMonth() + 1; // Months are zero-indexed, so add 1 var year = currentDate.getFullYear(); var formattedDate = day + '/' + month + '/' + year; -var currentVersion = 'v1.2.1 [' + formattedDate + ']'; +var currentVersion = 'v1.2.2 [' + formattedDate + ']'; getInitialSettings(); diff --git a/web/js/main.js b/web/js/main.js index fb150f2..8ce773a 100644 --- a/web/js/main.js +++ b/web/js/main.js @@ -370,7 +370,7 @@ socket.onmessage = (event) => { console.log('Kick iniitiated.') setTimeout(() => { window.location.href = '/403'; - }, 500); // Adjust the delay as needed + }, 500); return; } @@ -763,6 +763,7 @@ const updateDataElements = throttle(function(parsedData) { $dataPs.attr('aria-label', parsedData.ps); $dataRt0.attr('aria-label', parsedData.rt0); $dataRt1.attr('aria-label', parsedData.rt1); + $('#users-online-container').attr("aria-label", "Online users: " + parsedData.users); } }, 100); // Update at most once every 100 milliseconds @@ -850,9 +851,11 @@ function toggleAdminLock() { if($adminLockButton.hasClass('active')) { socket.send('wL0'); + $adminLockButton.attr('aria-label', '"ock Tuner (Admin)') $adminLockButton.removeClass('active'); } else { socket.send('wL1'); + $adminLockButton.attr('aria-label', 'Unlock Tuner (Admin)') $adminLockButton.addClass('active'); } } @@ -863,9 +866,11 @@ function togglePasswordLock() { if($passwordLockButton.hasClass('active')) { socket.send('wT0'); $passwordLockButton.removeClass('active'); + $passwordLockButton.attr('aria-label', 'Lock Tuner (Password tune)') } else { socket.send('wT1'); $passwordLockButton.addClass('active'); + $passwordLockButton.attr('aria-label', 'Unlock Tuner (Password tune)') } } diff --git a/web/setup.ejs b/web/setup.ejs index c68a6bb..13c56d0 100644 --- a/web/setup.ejs +++ b/web/setup.ejs @@ -19,21 +19,37 @@

[ADMIN PANEL]

-
-
+

Dashboard

@@ -121,7 +137,7 @@

Check for the latest source code • Support the developer

-
+

Connection settings

You can set up your connection settings here. Changing these settings requires a server restart.

Tuner connection:

@@ -182,7 +198,7 @@
-
+

Audio settings

You can set up your audio settings here. Changing these settings requires a server restart.

@@ -244,7 +260,7 @@
-
+

Webserver settings

@@ -403,7 +419,7 @@
-
+

Plugins

Any compatible .js plugin, which is in the "plugins" folder, will be listed here.
Click on the individual plugins to enable/disable them.

@@ -418,7 +434,7 @@
-
+

Tuner Specific Settings

@@ -449,7 +465,7 @@
-
+

Identification & Map