Update variables in test action

- Moved OP25 start outside of PDAB start callback
- Added more logging
- Set the pdabProcess variable to false when closing the discord client
- Update test variable names
- Added new WIP pdabWrappers tests to test the full wrappers as the client would

.gitea/workflows/DRBv3_tests.yaml

@@ -15,10 +15,12 @@ env:
   MONGO_INITDB_DATABASE: drb
   SERVER_PORT: 6000
   MONGO_URL: "mongodb://mongodb:27017/drb"
-  DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
-  TEST_CHANNEL_ID: ${{ secrets.TEST_CHANNEL_ID }}
   TEST_GUILD_ID: ${{ secrets.TEST_GUILD_ID }}
-  EXPECTED_CLIENT_ID: ${{ secrets.EXPECTED_CLIENT_ID }}
+  TEST_CLIENT_TOKEN: ${{ secrets.TEST_CLIENT_TOKEN }}
+  TEST_CHANNEL_ID: ${{ secrets.TEST_CHANNEL_ID }}
+  TEST_SYSTEM: ${{ secrets.TEST_SYSTEM }}
+  EXPECTED_CLIENT_ID: ${{ secrets.TEST_CLIENT_ID }}
+  EXPECTED_USERNAME: ${{ secrets.EXPECTED_USERNAME }}
   PDAB_PORT: ${{ vars.PDAB_PORT }}
 
 jobs:

client/discordAudioBot/pdabHandler.mjs

@@ -120,6 +120,7 @@ export const requestDiscordID = () => {
 export const requestDiscordClientClose = () => {
   return new Promise((res) => {
     io.timeout(25000).emit('request_client_close');
+    pdabProcess = false;
     res();
   });
 };

client/discordAudioBot/pdabWrappers.mjs

@@ -8,16 +8,22 @@ let activeDiscordClient = undefined;
  * @param {object} joinData The object containing all the information to join the server
  */
 export const joinDiscordVC = async (joinData) => {
-    console.log("Join requested: ", joinData)
+    console.log("Join requested: ", joinData);
     const connection = await new Promise(async (res) => {
         // Check if a client already exists 
+        console.log("Checking if there is a client open");
         if (!await checkIfClientIsOpen()) {
-            // Open a new client and join the requested channel with the requested ID
-            initDiscordBotClient(joinData.clientID, () => {
+            console.log("There is no open client, starting it now");
             // Open an instance of OP25
+            console.log("Starting OP25")
             openOP25(joinData.system);
 
+            // Open a new client and join the requested channel with the requested ID
+            initDiscordBotClient(joinData.clientID, () => {
+                console.log("Started PDAB")
+
                 // Add the client object to the IO instance
+                console.log("Connecting to channel")
                 connectToChannel(joinData.channelID, (connectionStatus) => {
                     console.log("Bot Connected to VC:", connectionStatus);
                     res(connectionStatus);
@@ -25,7 +31,9 @@ export const joinDiscordVC = async (joinData) => {
             });
         } else {
             // Join the requested channel with the requested ID
-            // Add the client object to the IO instance
+            console.log("There is an open client");
+
+            console.log("Connecting to channel")
             const connection = connectToChannel(joinData.channelID);
             console.log("Bot Connected to VC::");
             res(connection);

client/modules/subprocessHandler.mjs

@@ -1,4 +1,6 @@
 import { spawn } from "child_process";
+import dotenv from 'dotenv';
+dotenv.config()
 
 /**
  * Object to store references to spawned processes.
@@ -12,11 +14,11 @@ const runningProcesses = {};
  * @param {string[]} args - The arguments to pass to the process.
  * @param {boolean} waitForClose - Set this to wait to return until the process exits
  */
-export const launchProcess = (processName, args, waitForClose=false, pcwd=undefined) => {
+export const launchProcess = (processName, args, waitForClose = false, pcwd = undefined) => {
     if (!runningProcesses[processName]) {
         let childProcess;
         if (pcwd) {
-            childProcess = spawn(processName, args, {cwd: pcwd});
+            childProcess = spawn(processName, args, { cwd: pcwd });
         }
         else {
             childProcess = spawn(processName, args);
@@ -25,11 +27,29 @@ export const launchProcess = (processName, args, waitForClose=false, pcwd=undefi
         // Store reference to the spawned process
         runningProcesses[processName] = childProcess;
 
+        // Output the process output in development
+        var scriptOutput = "";
+
+        // Get the stdout from the child process
+        childProcess.stdout.setEncoding('utf8');
+        childProcess.stdout.on('data', (data) => {
+            if (process.env.NODE_ENV === "development") console.log(`Data from ${processName}:`, data);
+            scriptOutput += data.toString();
+        });
+
+        // Get the stderr from the child process
+        childProcess.stderr.setEncoding('utf8');
+        childProcess.stderr.on('data', (data) => {
+            if (process.env.NODE_ENV === "development") console.log(`Data from ${processName}:`, data);
+            scriptOutput += data.toString();
+        })
+
         let code = 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);
             })
         });

client/test/pdabHandler.test.js

@@ -1,8 +1,5 @@
 // Import necessary modules for testing
-import { use, expect } from 'chai'
-import chaiHttp from 'chai-http'
-const chai = use(chaiHttp)
-
+import { expect } from 'chai'
 import io from 'socket.io-client';
 const ioClient = io;
 
@@ -35,7 +32,7 @@ describe('Socket Server Tests', done => {
     });
 
     it('Should open a socket server and callback when the client is connected and ready', done => {
-        const clientId = process.env.DISCORD_CLIENT_ID;
+        const clientId = process.env.TEST_CLIENT_TOKEN;
 
         const callback = () => {
             done();
@@ -130,19 +127,9 @@ describe('Socket Server Tests', done => {
 });
 
 describe('Socket Client & Python IPC Tests', done => {
-    after(async () => {
-        // Any teardown needed after tests
-        try {
-            await socket.close();
-        }
-        catch {
-            console.log("Socket already closed");
-        }
-    });
-
     it('Should open a socket server and callback when the client is connected and ready', done => {
         let clientConnected = false;
-        const clientId = process.env.DISCORD_CLIENT_ID;
+        const clientId = process.env.TEST_CLIENT_TOKEN;
 
         const callback = () => {
             clientConnected = true;
@@ -165,13 +152,6 @@ describe('Socket Client & Python IPC Tests', done => {
         expect(status).to.be.true;
     });
 
-    it('Should have opened OP25', async () => {
-        // Assuming your server is running on localhost:8081
-        const res = await chai.request('http://localhost:8081').get('/');
-        expect(res).to.have.status(200); // Assuming 200 is the expected status code
-        // Add more assertions if needed
-    });
-
     it('Should emit command for and return status if connected to voice channel', async () => {
         // Simulate emitting 'check_discord_vc_connected' event
         const isConnected = await checkIfConnectedToVC(process.env.TEST_GUILD_ID);

client/test/pdabWrappers.test.js.bak

@@ -0,0 +1,40 @@
+import { use } from 'chai';
+import chaiHttp from 'chai-http';
+const chai = use(chaiHttp)
+chai.should();
+
+import dotenv from 'dotenv';
+dotenv.config()
+
+import { joinDiscordVC, leaveDiscordVC } from '../discordAudioBot/pdabWrappers.mjs'
+
+before(async () => {
+    // Any setup needed before tests
+});
+
+after(async () => {
+    // Any teardown needed after tests
+});
+
+describe('PDAB Wrapper Tests', () => {
+    it('Should open the discord bot, and join the first server when requested', async () => {
+        // Test case
+        const joinData = {
+            channelID: process.env.TEST_CHANNEL_ID,
+            clientID: process.env.TEST_CLIENT_TOKEN,
+            system: process.env.TEST_SYSTEM,
+        };
+        const connection = await joinDiscordVC(joinData);
+        console.log("Connection:", connection);
+    });
+
+    it('Should open OP25', async () => {
+        const res = await chai.request('http://localhost:8081').get('/');
+        expect(res).to.have.status(200); // Assuming 200 is the expected status code
+        // Add more assertions if needed
+    })
+
+    it("Should disconnect from the discord server", async () => {
+        await leaveDiscordVC(process.env.TEST_GUILD_ID);
+    })
+});