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

optimization, bugfixes

Browse Source
This commit is contained in:
NoobishSVK
2024-03-30 22:19:55 +01:00
parent 069585b6c8
commit ce7cf59921
6 changed files with 164 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/index.js
View File

@@ -23,7 +23,7 @@ const dataHandler = require('./datahandler');
const fmdxList = require('./fmdx_list');
const { logDebug, logError, logInfo, logWarn, logChat } = require('./console');
const storage = require('./storage');
const { serverConfig } = require('./server_config');
const { serverConfig, configExists } = require('./server_config');
const pjson = require('../package.json');
console.log(`\x1b[32m
@@ -445,7 +445,11 @@ app.use(express.static(path.join(__dirname, '../web'))); // Serve the entire web
httpServer.listen(serverConfig.webserver.webserverPort, serverConfig.webserver.webserverIp, () => {
let currentAddress = serverConfig.webserver.webserverIp;
currentAddress == '0.0.0.0' ? currentAddress = 'localhost' : currentAddress = serverConfig.webserver.webserverIp;
logInfo(`Web server is running at \x1b[34mhttp://${currentAddress}:${serverConfig.webserver.webserverPort}\x1b[0m.`);
if(configExists()) {
logInfo(`Web server has started on address \x1b[34mhttp://${currentAddress}:${serverConfig.webserver.webserverPort}\x1b[0m.`);
} else {
logInfo(`Open your browser and proceed to \x1b[34mhttp://${currentAddress}:${serverConfig.webserver.webserverPort}\x1b[0m to continue with setup.`);
}
});
fmdxList.update();

12
server/stream/index.js
View File

@@ -1,12 +1,10 @@
const { spawn } = require('child_process');
const consoleCmd = require('../console.js');
const ffmpeg = require('ffmpeg-static');
const { configName, serverConfig, configUpdate, configSave } = require('../server_config');
const { configName, serverConfig, configUpdate, configSave, configExists } = require('../server_config');
const { logDebug, logError, logInfo, logWarn, logFfmpeg } = require('../console');
function enableAudioStream() {
var ffmpegParams;
var ffmpegCommand;
var ffmpegParams, ffmpegCommand;
serverConfig.webserver.webserverPort = Number(serverConfig.webserver.webserverPort);
const flags = `-fflags +nobuffer+flush_packets -flags low_delay -rtbufsize 6192 -probesize 32`;
@@ -16,7 +14,7 @@ function enableAudioStream() {
if (process.platform === 'win32') {
// Windows
ffmpegCommand = "\"" + ffmpeg.replace(/\\/g, '\\\\') + "\"";
ffmpegParams = `${flags} -f dshow -audio_buffer_size 50 -i audio="${serverConfig.audio.audioDevice}" ${codec} ${output} pipe:1 | node server/stream/3las.server.js -port ${serverConfig.webserver.webserverPort + 10} -samplerate 48000 -channels ${serverConfig.audio.audioChannels}`;
ffmpegParams = `${flags} -f dshow -audio_buffer_size 200 -i audio="${serverConfig.audio.audioDevice}" ${codec} ${output} pipe:1 | node server/stream/3las.server.js -port ${serverConfig.webserver.webserverPort + 10} -samplerate 48000 -channels ${serverConfig.audio.audioChannels}`;
} else {
// Linux
ffmpegCommand = 'ffmpeg';
@@ -56,4 +54,6 @@ function enableAudioStream() {
}
}
enableAudioStream();
if(configExists()) {
enableAudioStream();
}