1
0
mirror of https://github.com/KubaPro010/fm-dx-webserver.git synced 2026-02-26 22:13:53 +01:00

library cleanup / code cleanup + custom titles

This commit is contained in:
NoobishSVK
2024-01-21 23:14:56 +01:00
parent 830d79564f
commit 8a450f74da
7 changed files with 41 additions and 164 deletions

View File

@@ -4,23 +4,19 @@ const http = require('http');
const WebSocket = require('ws');
const path = require('path');
const net = require('net');
const cors = require('cors');
const axios = require('axios');
const crypto = require('crypto');
let receivedSalt = '';
let receivedPassword = false;
let currentUsers = 0;
const infoMsg = "\x1b[32m[INFO]\x1b[0m";
const debugMsg = "\x1b[36m[DEBUG]\x1b[0m";
// Other JS files
const dataHandler = require('./datahandler');
const config = require('./userconfig');
/* Server settings */
const { webServerHost, webServerPort, xdrdServerHost, xdrdServerPort, xdrdPassword, qthLatitude, qthLongitude } = config;
const { webServerHost, webServerPort, webServerName, xdrdServerHost, xdrdServerPort, xdrdPassword, qthLatitude, qthLongitude } = config;
const infoMsg = "\x1b[32m[INFO]\x1b[0m";
const debugMsg = "\x1b[36m[DEBUG]\x1b[0m";
let receivedSalt = '';
let receivedPassword = false;
let currentUsers = 0;
const wss = new WebSocket.Server({ noServer: true });
@@ -34,7 +30,7 @@ wss.on('connection', (ws, request) => {
const clientIp = request.connection.remoteAddress;
currentUsers++;
dataHandler.showOnlineUsers(currentUsers);
console.log(infoMsg, `WebSocket client \x1b[32mconnected\x1b[0m (${clientIp}) \x1b[90m[${currentUsers}]`);
console.log(infoMsg, `Web client \x1b[32mconnected\x1b[0m (${clientIp}) \x1b[90m[${currentUsers}]`);
ws.on('message', (message) => {
if(config.verboseMode === true) {
@@ -47,7 +43,7 @@ wss.on('connection', (ws, request) => {
ws.on('close', (code, reason) => {
currentUsers--;
dataHandler.showOnlineUsers(currentUsers);
console.log(infoMsg, `WebSocket client \x1b[31mdisconnected\x1b[0m (${clientIp}) \x1b[90m[${currentUsers}]`);
console.log(infoMsg, `Web client \x1b[31mdisconnected\x1b[0m (${clientIp}) \x1b[90m[${currentUsers}]`);
});
ws.on('error', console.error);
@@ -60,16 +56,11 @@ app.use(express.static(path.join(__dirname, 'web')));
// Function to authenticate with the xdrd server
function authenticateWithXdrd(client, salt, password) {
const sha1 = crypto.createHash('sha1');
// Convert salt and password to buffers
const saltBuffer = Buffer.from(salt, 'utf-8');
const passwordBuffer = Buffer.from(password, 'utf-8');
// Update the hash context with salt and password
sha1.update(saltBuffer);
sha1.update(passwordBuffer);
// Finalize the hash and get the hashed password
const hashedPassword = sha1.digest('hex');
client.write(hashedPassword + '\n');
client.write('x\n');
@@ -83,7 +74,7 @@ client.connect(xdrdServerPort, xdrdServerHost, () => {
const receivedData = data.toString();
const lines = receivedData.split('\n');
// Assuming that the first message contains the salt
// Salt reading, so we can authenticate
if (lines.length > 0 && !receivedPassword) {
receivedSalt = lines[0].trim();
authenticateWithXdrd(client, receivedSalt, xdrdPassword);
@@ -120,32 +111,6 @@ httpServer.listen(webServerPort, webServerHost, () => {
});
app.get('/coordinates', (req, res) => {
// Sending the coordinates to the client
res.json({ qthLatitude, qthLongitude });
});
/* Audio */
app.get('/audio-proxy', (req, res) => {
const audioStreamUrl = 'http://fmdx.pl:8000/noobish.opus';
axios.get(audioStreamUrl, {
headers: {
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36',
},
responseType: 'stream', // Specify the response type as a stream
})
.then((response) => {
const contentType = response.headers['content-type'] || 'audio/ogg';
res.setHeader('Content-Type', contentType);
res.setHeader('Access-Control-Allow-Origin', '*');
console.log(contentType);
response.data.pipe(res);
})
.catch((error) => {
console.error('Error in audio proxy request:', error);
res.status(500).send('Error in audio proxy request');
});
});
app.use('/audio-proxy', cors());
app.get('/static_data', (req, res) => {
res.json({ qthLatitude, qthLongitude, webServerName });
});