#16 Update variable name

- Move PDAB socket server startup to function
- Updated join server wrapper to start the server before opening the python app

.gitea/workflows/DRBv3_server_build.yaml

@@ -0,0 +1,24 @@
+name: DRB Server Build
+
+on:
+  push:
+    branches:
+      - master
+
+env:
+  NODE_ENV: production
+  SERVER_PORT: 3000
+  MONGO_URL: ${{ secrets.MONGO_URL }}
+  DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
+
+jobs:
+  drb_server_build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Build the latest code
+        working-directory: './server'
+        run: make build

.gitea/workflows/DRBv3_tests.yaml

@@ -1,4 +1,4 @@
-name: DRB Build Tests
+name: DRB Tests
 
 on:
   pull_request:
@@ -13,16 +13,19 @@ env:
   MONGO_INITDB_ROOT_USERNAME: admin
   MONGO_INITDB_ROOT_PASSWORD: admin
   MONGO_INITDB_DATABASE: drb
-  SERVER_PORT: 6000
+  SERVER_PORT: 3000
   MONGO_URL: "mongodb://mongodb:27017/drb"
-  DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
+  DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
-  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:
-  drb_build_and_test:
+  drb_mocha_tests:
     runs-on: ubuntu-latest
 
     services:

client/discordAudioBot/pdabHandler.mjs

@@ -19,6 +19,14 @@ const __dirname = dirname(__filename);
 
 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"));
+  pdabProcess = true; // TODO - Make this more dynamic
+}
+
+export const startPdabSocketServer = () => {
   const port = process.env.PDAB_PORT || 3000;
 
   io.on('connection', (socket) => {
@@ -38,12 +46,7 @@ io.on('connection', (socket) => {
   server.listen(port, async () => {
     console.log(`Server is running on port ${port}`);
   });
-
+  return
-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"));
-  pdabProcess = true; // TODO - Make this more dynamic
 }
 
 export const closePdabSocketServer = () => {
@@ -75,6 +78,15 @@ export const leaveVoiceChannel = async (guildId) => {
   });
 };
 
+// Set the presense of the discord client
+export const setDiscordClientPrsense = (system) => {
+  return new Promise((res) => {
+    io.timeout(25000).emit('set_system', { system: system }, (status) => {
+      res();
+    });
+  });
+};
+
 // Placeholder functions (replace with actual implementation)
 export const checkIfConnectedToVC = async (guildId) => {
   console.log("Pdab process var:", pdabProcess);
@@ -120,6 +132,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

@@ -1,4 +1,4 @@
-import { connectToChannel, leaveVoiceChannel, checkIfConnectedToVC, initDiscordBotClient, requestDiscordUsername, requestDiscordID, requestDiscordClientClose, closePdabSocketServer } from './pdabHandler.mjs';
+import { connectToChannel, leaveVoiceChannel, checkIfConnectedToVC, initDiscordBotClient, requestDiscordUsername, requestDiscordID, requestDiscordClientClose, closePdabSocketServer, setDiscordClientPrsense, startPdabSocketServer } from './pdabHandler.mjs';
 import { openOP25, closeOP25 } from '../op25Handler/op25Handler.mjs';
 
 let activeDiscordClient = undefined;
@@ -8,16 +8,26 @@ 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
+            console.log("There is no open client, starting it now");
-            initDiscordBotClient(joinData.clientID, () => {
+            await startPdabSocketServer();
             // 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");
+
+                console.log("Setting the presense of the bot");
+                setDiscordClientPrsense(joinData.system);
+
                 // 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 +35,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.
@@ -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/post-update.sh

@@ -4,8 +4,8 @@
 npm install
 
 # Install OP25 Updates
-cd ./op25
+#cd ./op25
-bash rebuild.sh
+#bash rebuild.sh
 
 # Check for PDAB updates
 cd ../discordAudioBot/pdab

client/test/pdabHandler.test.js

@@ -1,8 +1,5 @@
 // Import necessary modules for testing
-import { use, expect } from 'chai'
+import { expect } from 'chai'
-import chaiHttp from 'chai-http'
-const chai = use(chaiHttp)
-
 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);
+    })
+});

server/Dockerfile

@@ -0,0 +1,21 @@
+# Use the official Node.js image as the base image
+FROM node:20
+
+# Set the working directory inside the container
+WORKDIR /server
+
+# Copy package.json and package-lock.json (if available) to the working directory
+COPY package*.json ./
+
+# Install dependencies
+RUN npm install -g node-gyp
+RUN npm install
+
+# Copy the rest of the application code to the working directory
+COPY . .
+
+# Expose the port on which your Node.js application will run
+EXPOSE 3000
+
+# Command to run the Node.js application
+CMD ["node", "."]

server/discordBot/commands/join.mjs

@@ -57,13 +57,19 @@ export async function execute(nodeIo, interaction) {
     const joinSelectedNode = async (selectedNodeSocketId) => {
       const openSocket = await nodeIo.sockets.sockets.get(selectedNodeSocketId);
       // Get the open ID for this connection\
-      const discordToken = await getAvailableTokensInGuild(nodeIo, interaction.guild.id);
+      const ss = await getAvailableTokensInGuild(nodeIo, interaction.guild.id);
-      // TODO - Implement a method to have preferred tokens (bot users) for specific systems
+      console.log("Available discord tokens: ", discordTokens);
 
-      console.log("Joining selected open socket:", selectedNodeSocketId, system.name, channelToJoin.id, openSocket.node.name, discordToken);
+      if (discordTokens.length >= 1) {
+        // TODO - Implement a method to have preferred tokens (bot users) for specific systems
+        console.log("Joining selected open socket:", selectedNodeSocketId, system.name, channelToJoin.id, openSocket.node.name, discordTokens[0].token);
 
         // Ask the node to join the selected channel and system
-      await requestNodeJoinSystem(openSocket, system.name, channelToJoin.id, discordToken[0].token);
+        await requestNodeJoinSystem(openSocket, system.name, channelToJoin.id, discordTokens[0].token);
+      }
+      else {
+        return await interaction.editReply({ content: `<@${interaction.member.id}>, there are no free bots. Free up or create a new bot ID (discord app) to listen to this system.`, ephemeral: true })
+      }
     }
 
     // Get all open socket nodes

server/discordBot/modules/wrappers.mjs

@@ -37,10 +37,7 @@ export const checkOnlineBotsInGuild = async (nodeIo, guildId) => {
         console.log("Online bots in the guild:", onlineBots);
 
         // Filter any discordIDs that are not active
-        var availableDiscordIDs = discordIDs.filter(discordID => discordID.active == true);
+        const availableDiscordIDs = discordIDs.filter(discordID => discordID.active == true).filter(discordID => !onlineBots.some(bot => Number(bot.discord_id) == discordID.discord_id));
-        
-        // Filter out discordIDs that are not found in onlineBots
-        availableDiscordIDs = availableDiscordIDs.filter(discordID => !onlineBots.some(bot => bot.discord_id === discordID.discord_id));
 
         // Return the unavailable discordIDs
         return availableDiscordIDs;

server/makefile

@@ -0,0 +1,25 @@
+# Define variables
+DOCKER_IMAGE_NAME := drb-server
+
+# Define targets and rules
+.PHONY: clean build run
+
+clean:
+	@echo "Cleaning existing Docker images, containers, and builds..."
+	docker stop drb || true
+	docker rm drb || true
+	docker rmi $(DOCKER_IMAGE_NAME) || true
+
+build:
+	@echo "Building Docker image..."
+	docker build -t $(DOCKER_IMAGE_NAME) .
+
+run:
+	@echo "Running Docker container..."
+	docker run -d -e NODE_ENV=${NODE_ENV} \
+				-e SERVER_PORT=${SERVER_PORT} \
+				-e MONGO_URL=${MONGO_URL} \
+				-e DISCORD_TOKEN=${DISCORD_TOKEN} \
+				-p ${SERVER_PORT}:${SERVER_PORT} \
+				--name=drb \
+				$(DOCKER_IMAGE_NAME)