audioonly

server/endpoints.js

@@ -22,9 +22,9 @@ router.get('/', (req, res) => {
     let requestIp = helpers.getIpAddress(req);
 
     const ipList = (requestIp || '').split(',').map(ip => ip.trim()).filter(Boolean); // in case there are multiple IPs (proxy), we need to check all of them (No we don't)
-    
+
     const banEntry = serverConfig.webserver.banlist.find(banEntry => ipList.includes(banEntry[0]));
-    
+
     if (banEntry) {
         const reason = banEntry[3];
         res.render('403', { reason });
@@ -36,14 +36,14 @@ router.get('/', (req, res) => {
 
     if (configExists() === false) {
         let serialPorts;
-        
+
         SerialPort.list()
         .then((deviceList) => {
             serialPorts = deviceList.map(port => ({
                 path: port.path,
                 friendlyName: port.friendlyName,
             }));
-            
+
             parseAudioDevice((result) => {
                 res.render('wizard', { // Magical utility wizard
                     isAdminAuthenticated: true,
@@ -91,9 +91,13 @@ router.get('/403', (req, res) => {
     res.render('403', { reason });
 })
 
+router.get('/audioonly', (req, res) => {
+    res.render('audioonly');
+})
+
 router.get('/wizard', (req, res) => {
     let serialPorts;
-    
+
     if(!req.session.isAdminAuthenticated) {
         res.render('login');
         return;
@@ -105,7 +109,7 @@ router.get('/wizard', (req, res) => {
             path: port.path,
             friendlyName: port.friendlyName,
         }));
-        
+
         parseAudioDevice((result) => {
             res.render('wizard', {
                 isAdminAuthenticated: req.session.isAdminAuthenticated,
@@ -121,9 +125,9 @@ router.get('/wizard', (req, res) => {
         });
     })
 })
-  
+
 router.get('/setup', (req, res) => {
-    let serialPorts; 
+    let serialPorts;
     function loadConfig() {
         if (fs.existsSync(configPath)) {
             const configFileContents = fs.readFileSync(configPath, 'utf8');
@@ -136,18 +140,18 @@ router.get('/setup', (req, res) => {
         res.render('login');
         return;
     }
-    
+
     SerialPort.list()
     .then((deviceList) => {
         serialPorts = deviceList.map(port => ({
             path: port.path,
             friendlyName: port.friendlyName,
         }));
-        
+
         parseAudioDevice((result) => {
             const processUptimeInSeconds = Math.floor(process.uptime());
             const formattedProcessUptime = helpers.formatUptime(processUptimeInSeconds);
-            
+
             const updatedConfig = loadConfig();  // Reload the config every time
             res.render('setup', {
                 isAdminAuthenticated: req.session.isAdminAuthenticated,
@@ -171,9 +175,9 @@ router.get('/setup', (req, res) => {
                 }))
             });
         });
-    }) 
+    })
 });
-  
+
 
 router.get('/rds', (req, res) => {
     res.send('Please connect using a WebSocket compatible app to obtain the RDS stream.');
@@ -197,7 +201,7 @@ router.get('/api', (req, res) => {
 
 const loginAttempts = {}; // Format: { 'ip': { count: 1, lastAttempt: 1234567890 } }
 const MAX_ATTEMPTS = 10;
-const WINDOW_MS = 15 * 60 * 1000; 
+const WINDOW_MS = 15 * 60 * 1000;
 
 const authenticate = (req, res, next) => {
     const ip = helpers.getIpAddress(req);
@@ -305,7 +309,7 @@ router.post('/saveData', (req, res) => {
     if(req.session.isAdminAuthenticated || !configExists()) {
         configUpdate(data);
         fmdxList.update();
-        
+
         if(!configExists()) firstSetup = true;
         logInfo('Server config changed successfully.');
         if(firstSetup === true) res.status(200).send('Data saved successfully!\nPlease, restart the server to load your configuration.');
@@ -313,9 +317,9 @@ router.post('/saveData', (req, res) => {
     }
 });
 
-router.get('/getData', (req, res) => {  
+router.get('/getData', (req, res) => {
     if (configExists() === false) res.json(serverConfig);
-    
+
     if(req.session.isAdminAuthenticated) {
         // Check if the file exists
         fs.access(configPath, fs.constants.F_OK, (err) => {
@@ -360,7 +364,7 @@ router.get('/server_time', (req, res) => {
 
 router.get('/ping', (req, res) => {
     res.send('pong');
-});  
+});
 
 const logHistory = {};
 
@@ -368,27 +372,27 @@ const logHistory = {};
 function canLog(id) {
     const now = Date.now();
     const sixtyMinutes = 60 * 60 * 1000; // 60 minutes in milliseconds
-    
+
     // Remove expired entries
     for (const [entryId, timestamp] of Object.entries(logHistory)) {
         if ((now - timestamp) >= sixtyMinutes) {
             delete logHistory[entryId];
         }
     }
-    
+
     if (logHistory[id] && (now - logHistory[id]) < sixtyMinutes) return false; // Deny logging if less than 60 minutes have passed
     logHistory[id] = now; // Update with the current timestamp
     return true;
 }
 
 router.get('/log_fmlist', (req, res) => {
-    if (dataHandler.dataToSend.txInfo.tx.length === 0) {
+    if (serverConfig.extras.fmlistIntegration === false || (serverConfig.extras.fmlistAdminOnly && !req.session.isTuneAuthenticated)) {
-        res.status(500).send('No suitable transmitter to log.');
+        res.status(500).send('FMLIST Integration is not available.');
         return;
     }
 
-    if (serverConfig.extras.fmlistIntegration === false || (serverConfig.extras.fmlistAdminOnly && !req.session.isTuneAuthenticated)) {
+    if (dataHandler.dataToSend.txInfo.tx.length === 0) {
-        res.status(500).send('FMLIST Integration is not available.');
+        res.status(500).send('No suitable transmitter to log.');
         return;
     }
 
@@ -468,7 +472,7 @@ router.get('/tunnelservers', async (req, res) => {
       { value: "sg", host: "sg.fmtuner.org", label: "Asia & Oceania" },
       { value: "pldx", host: "pldx.duckdns.org", label: "Poland (k201)" },
     ];
-  
+
     const results = await Promise.all(
       servers.map(async s => {
         const latency = await helpers.checkLatency(s.host);
@@ -478,7 +482,7 @@ router.get('/tunnelservers', async (req, res) => {
         };
       })
     );
-  
+
     res.json(results);
   });
 

server/index.js

@@ -319,7 +319,7 @@ wss.on('connection', (ws, request) => {
         }
     }
 
-    if (clientIp !== '::ffff:127.0.0.1' ||
+    if (clientIp !== '127.0.0.1' ||
       (request.socket && request.socket.remoteAddress && request.socket.remoteAddress !== '::ffff:127.0.0.1') ||
       (request.headers && request.headers['origin'] && request.headers['origin'].trim() !== '')) {
       currentUsers++;
@@ -392,7 +392,6 @@ wss.on('connection', (ws, request) => {
         const isLocalIp = (
           clientIp === '127.0.0.1' ||
           clientIp === '::1' ||
-          clientIp === '::ffff:127.0.0.1' ||
           clientIp.startsWith('192.168.') ||
           clientIp.startsWith('10.') ||
           clientIp.startsWith('172.16.')

views/audioonly.ejs

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>FM-DX Webserver (Audio)</title>
+  <link rel="icon" type="image/svg+xml" href="favicon.svg" id="favicon" />
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+
+  <script src="js/audio.js"></script>
+</head>
+<body>
+  <button class="playbutton">start</button>
+  <input type="range" id="volumeSlider" min="0" max="1" step="0.01" value="1">
+</body>
+</html>

views/index.ejs

@@ -539,9 +539,6 @@
         </div>
         <div class="modal-panel-footer flex-container flex-phone">
           <div class="modal-panel-sidebar" style="font-size: 22px;">
-            <div class="flex-center" style="height: 50px">
-              <i class="fa-solid fa-hand-holding-medical"></i>
-            </div>
             <div class="flex-center" style="height: 50px">
               <i class="fa-brands fa-discord"></i>
             </div>

web/js/audio.js

@@ -77,8 +77,7 @@ function Init(_ev) {
 function createStream() {
     try {
         const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
-        const audioUrl = `${wsProtocol}//${location.hostname}/audio`;
+        Stream = new WebSocketAudioPlayer(`${wsProtocol}//${location.hostname}/audio`);
-        Stream = new WebSocketAudioPlayer(audioUrl);
         Stream.setVolume($('#volumeSlider').val());
     } catch (error) {
         console.error("Initialization Error: ", error);
@@ -100,14 +99,14 @@ function OnPlayButtonClick(_ev) {
         console.log("Stopping stream...");
         shouldReconnect = false;
         destroyStream();
-        $playbutton.find('.fa-solid').toggleClass('fa-stop fa-play');
+        $playbutton.find('.fa-solid')?.toggleClass('fa-stop fa-play');
         if (isAppleiOS && 'audioSession' in navigator) navigator.audioSession.type = "none";
     } else {
         console.log("Starting stream...");
         shouldReconnect = true;
         createStream();
         Stream.start();
-        $playbutton.find('.fa-solid').toggleClass('fa-play fa-stop');
+        $playbutton.find('.fa-solid')?.toggleClass('fa-play fa-stop');
         if (isAppleiOS && 'audioSession' in navigator) navigator.audioSession.type = "playback";
     }