Update Setup Process

- Added audio device to setup form
- Implemented 'getDevices.py' into setup form
- Now shows the user their devices to select the correct ID
- Fixed bug in the op25 dir created by new setup
- Finalized the '.env' file creation

discordAudioBot/pdabHandler.mjs

@@ -22,7 +22,7 @@ let botCallback;
 export const initDiscordBotClient = (clientId, callback, runPDAB = true) => {
   botCallback = callback;
 
-  if (runPDAB) launchProcess("python", [join(__dirname, "./pdab/main.py"), process.env.AUDIO_DEVICE_ID, clientId, port], false, join(__dirname, "./pdab"));
+  if (runPDAB) launchProcess("python", [join(__dirname, "./pdab/main.py"), process.env.AUDIO_DEVICE_ID, clientId, port], false, false, join(__dirname, "./pdab"));
   pdabProcess = true; // TODO - Make this more dynamic
 }
 

express/routes/setupRoutes.js

@@ -4,6 +4,7 @@ import express from 'express';
 import { fileURLToPath } from 'url';
 import { generateUniqueID } from '../../modules/baseUtils.mjs';
 import { restartApplication } from '../../modules/selfUpdater.mjs'
+import { launchProcess } from '../../modules/subprocessHandler.mjs'
 
 const router = express.Router();
 const __dirname = path.dirname(fileURLToPath(import.meta.url)); // Define __dirname for ESM
@@ -12,8 +13,10 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url)); // Define __dirn
 let systemsData = [];
 let nodeData = {};
 
-router.get('/', (req, res) => {
-    res.render('setup/setup');
+router.get('/', async (req, res) => {
+    const output = await launchProcess('python', ['./discordAudioBot/pdab/getDevices.py'], true, true)
+    console.log("Device List", output);
+    res.render('setup/setup', { deviceList: output });
 });
 
 // Route to serve the page for adding nearby systems
@@ -23,13 +26,14 @@ router.get('/add-system', (req, res) => {
 
 router.post('/', (req, res) => {
     // Handle form submission here
-    const { clientName, clientLocation, clientCapabilities } = req.body;
+    const { clientName, clientLocation, clientCapabilities, audioDeviceId } = req.body;
 
-    console.log(clientName, clientLocation, clientCapabilities);
+    console.log(clientName, clientLocation, clientCapabilities, audioDeviceId);
 
     nodeData.clientName = clientName;
     nodeData.clientLocation = clientLocation;
     nodeData.clientCapabilities = clientCapabilities;
+    nodeData.audioDeviceId = audioDeviceId;
 
     res.redirect('/setup/add-system');
 });
@@ -86,8 +90,11 @@ const exportCsv = (nodeData) => {
         CLIENT_CAPABILITIES: nodeData.clientCapabilities,
         SERVER_IP: "",
         SERVER_PORT: 0,
-        OP25_FULL_PATH: `${__dirname}/op25/op25/gr-op25_repeater/apps`,
+        OP25_FULL_PATH: path.resolve(__dirname, '../../op25/op25/gr-op25_repeater/apps'),
         CONFIG_PATH: "./config/radioPresets.json",
+        AUDIO_DEVICE_ID: nodeData.audioDeviceId,
+        PDAB_PORT: 3110,
+        NODE_ENV: "production",
     };
 
     // Generate .env file content

express/views/setup/setup.ejs

@@ -19,7 +19,14 @@
         <label for="clientCapabilities">Client Capabilities (comma-separated):</label>
         <input type="text" id="clientCapabilities" name="clientCapabilities" required>
         <br>
+        <label for="audioDeviceId">Audio Device ID (typically 'default'):</label>        
+        <input type="text" id="audioDeviceId" name="audioDeviceId" required>        
+        <br>
         <button type="submit">Next</button>
+        <div>
+            <h3>Audio Devices</h3>
+            <p><%- deviceList.replace(/\n/g, '<br>') %> </p>
+        </div>
     </form>
 </body>
 </html>

modules/subprocessHandler.mjs

@@ -13,8 +13,10 @@ const runningProcesses = {};
  * @param {string} processName - The name of the process to launch.
  * @param {string[]} args - The arguments to pass to the process.
  * @param {boolean} waitForClose - Set this to wait to return until the process exits
+ * @param {boolean} returnOutput - Set this in addition to 'waitForClose' to return the script output when the process closes
+ * @param {boolean} waitForClose - Set the current working directory of the process being launched
  */
-export const launchProcess = (processName, args, waitForClose = false, pcwd = undefined) => {
+export const launchProcess = (processName, args, waitForClose = false, returnOutput = false, pcwd = undefined) => {
     if (!runningProcesses[processName]) {
         let childProcess;
         if (pcwd) {
@@ -44,18 +46,22 @@ export const launchProcess = (processName, args, waitForClose = false, pcwd = un
             scriptOutput += data.toString();
         })
 
-        let code = new Promise(res => {
+        let output = new Promise(res => {
             childProcess.on('exit', (code, signal) => {
                 // Remove reference to the process when it exits
                 delete runningProcesses[processName];
                 console.log(`${processName} process exited with code ${code} and signal ${signal}`);
                 console.log("Child process console output: ", scriptOutput);
-                res(code);
+                // Return the full script output if requested
+                if (returnOutput === true) {
+                    return res(scriptOutput)
+                }
+                return res(code);
             })
         });
 
         if (waitForClose === true) {
-            return code
+            return output
         }
 
         console.log(`${processName} process started.`);