bugfixes / more code cleanup

server/stream/3las.server.js

@@ -1,16 +1,7 @@
 "use strict";
 var fs = require('fs');
-
-let serverConfig = {
-    audio: {
-      audioBitrate: "128k"
-    },
-};
-
-if(fs.existsSync('./config.json')) {
-    const configFileContents = fs.readFileSync('./config.json', 'utf8');
-    serverConfig = JSON.parse(configFileContents);
-}
+const ffmpegStaticPath = require('ffmpeg-static');
+const {serverConfig} = require('../server_config')
 
 /*
     Stdin streamer is part of 3LAS (Low Latency Live Audio Streaming)
@@ -50,12 +41,7 @@ const child_process_1 = require("child_process");
 const ws = __importStar(require("ws"));
 const wrtc = require('wrtc');
 const Settings = JSON.parse((0, fs_1.readFileSync)('server/stream/settings.json', 'utf-8'));
-const FFmpeg_command = (() => {
-    if (process.platform === 'win32')
-        return Settings.FallbackFFmpegPath;
-    else if (process.platform === 'linux')
-        return "ffmpeg";
-})();
+const FFmpeg_command = ffmpegStaticPath;
 class RtcProvider {
     constructor() {
         this.RtcDistributePeer = new wrtc.RTCPeerConnection(Settings.RtcConfig);

server/stream/index.js

@@ -1,29 +1,18 @@
 const { spawn } = require('child_process');
 const consoleCmd = require('../console.js');
+const ffmpeg = require('ffmpeg-static');
 const { configName, serverConfig, configUpdate, configSave } = require('../server_config');
-const { logDebug, logError, logInfo, logWarn } = require('../console');
-const commandExists = require('command-exists-promise');
-
-// Check if FFmpeg is installed
-commandExists('ffmpeg')
-  .then(exists => {
-    if (exists) {
-      logInfo("An existing installation of ffmpeg found, enabling audio stream.");
-      enableAudioStream();
-    } else {
-      logError("No ffmpeg installation found. Audio stream won't be available.");
-    }
-  })
-
+const { logDebug, logError, logInfo, logWarn, logFfmpeg } = require('../console');
+  
 function enableAudioStream() {
     var ffmpegCommand;
     serverConfig.webserver.webserverPort = Number(serverConfig.webserver.webserverPort);
-    // Specify the command and its arguments
-    const command = 'ffmpeg';
+
+    const command = ffmpeg.replace(/\\/g, '\\\\');
     const flags = `-fflags +nobuffer+flush_packets -flags low_delay -rtbufsize 6192 -probesize 32`;
     const codec = `-acodec pcm_s16le -ar 48000 -ac ${serverConfig.audio.audioChannels}`;
     const output = `-f s16le -fflags +nobuffer+flush_packets -packetsize 384 -flush_packets 1 -bufsize 960`;
-    // Combine all the settings for the ffmpeg command
+
     if (process.platform === 'win32') {
         // Windows
         ffmpegCommand = `${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}`;
@@ -34,28 +23,27 @@ function enableAudioStream() {
 
     consoleCmd.logInfo("Using audio device: " + serverConfig.audio.audioDevice);
     consoleCmd.logInfo(`Launching audio stream on internal port ${serverConfig.webserver.webserverPort + 10}.`);
-    // Spawn the child process
 
+    // If an audio device is configured, start the stream
     if(serverConfig.audio.audioDevice.length > 2) {
         const childProcess = spawn(command, [ffmpegCommand], { shell: true });
 
-        // Handle the output of the child process (optional)
         childProcess.stdout.on('data', (data) => {
-            consoleCmd.logFfmpeg(`stdout: ${data}`);
+            logFfmpeg(`stdout: ${data}`);
         });
 
         childProcess.stderr.on('data', (data) => {
-            consoleCmd.logFfmpeg(`stderr: ${data}`);
+            logFfmpeg(`stderr: ${data}`);
         });
     
-        // Handle the child process exit event
         childProcess.on('close', (code) => {
-            consoleCmd.logFfmpeg(`Child process exited with code ${code}`);
+            logFfmpeg(`Child process exited with code ${code}`);
         });
     
-        // You can also listen for the 'error' event in case the process fails to start
         childProcess.on('error', (err) => {
-            consoleCmd.logFfmpeg(`Error starting child process: ${err}`);
+            logFfmpeg(`Error starting child process: ${err}`);
         });
     }
-}
+}
+
+enableAudioStream();

server/stream/parser.js

@@ -2,6 +2,7 @@
 
 const exec = require('child_process').exec;
 const fs = require('fs');
+const ffmpeg = require('ffmpeg-static');
 const filePath = '/proc/asound/cards';
 const platform = process.platform;
 
@@ -15,7 +16,7 @@ function parseAudioDevice(options, callback) {
         options = null;
     }
     options = options || {};
-    const ffmpegPath = options.ffmpegPath || 'ffmpeg';
+    const ffmpegPath = ffmpeg.replace(/\\/g, '\\\\');
     const callbackExists = typeof callback === 'function';
     
     let inputDevice, prefix, audioSeparator, alternativeName, deviceParams;