#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,8 +13,9 @@ 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_TOKEN: ${{ secrets.DISCORD_TOKEN }}
   TEST_GUILD_ID: ${{ secrets.TEST_GUILD_ID }}
   TEST_CLIENT_TOKEN: ${{ secrets.TEST_CLIENT_TOKEN }}
   TEST_CHANNEL_ID: ${{ secrets.TEST_CHANNEL_ID }}
@@ -24,7 +25,7 @@ env:
   PDAB_PORT: ${{ vars.PDAB_PORT }}
 
 jobs:
-  drb_build_and_test:
+  drb_mocha_tests:
     runs-on: ubuntu-latest
 
     services:

client/discordAudioBot/pdabHandler.mjs

@@ -19,26 +19,6 @@ const __dirname = dirname(__filename);
 
 let botCallback;
 
-const port = process.env.PDAB_PORT || 3000;
-
-io.on('connection', (socket) => {
-  console.log('A user connected');
-
-  socket.on('disconnect', () => {
-    console.log('User disconnected');
-  });
-
-  // Listen for the discord client ready event
-  socket.on('discord_ready', (message) => {
-    console.log("Message from local client", message);
-    botCallback();
-  });
-});
-
-server.listen(port, async () => {
-  console.log(`Server is running on port ${port}`);
-});
-
 export const initDiscordBotClient = (clientId, callback, runPDAB = true) => {
   botCallback = callback;
 
@@ -46,6 +26,29 @@ export const initDiscordBotClient = (clientId, callback, runPDAB = true) => {
   pdabProcess = true; // TODO - Make this more dynamic
 }
 
+export const startPdabSocketServer = () => {
+  const port = process.env.PDAB_PORT || 3000;
+
+  io.on('connection', (socket) => {
+    console.log('A user connected');
+
+    socket.on('disconnect', () => {
+      console.log('User disconnected');
+    });
+
+    // Listen for the discord client ready event
+    socket.on('discord_ready', (message) => {
+      console.log("Message from local client", message);
+      botCallback();
+    });
+  });
+
+  server.listen(port, async () => {
+    console.log(`Server is running on port ${port}`);
+  });
+  return
+}
+
 export const closePdabSocketServer = () => {
   if (io.sockets && io.sockets.length > 0) {
     io.sockets.forEach(socket => {
@@ -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);

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;
@@ -14,13 +14,17 @@ export const joinDiscordVC = async (joinData) => {
         console.log("Checking if there is a client open");
         if (!await checkIfClientIsOpen()) {
             console.log("There is no open client, starting it now");
+            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("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")

client/post-update.sh

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

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);
-      // 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, discordToken);
+      const ss = await getAvailableTokensInGuild(nodeIo, interaction.guild.id);
+      console.log("Available discord tokens: ", discordTokens);
 
-      // Ask the node to join the selected channel and system
-      await requestNodeJoinSystem(openSocket, system.name, channelToJoin.id, discordToken[0].token);
+      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, 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);
-        
-        // Filter out discordIDs that are not found in onlineBots
-        availableDiscordIDs = availableDiscordIDs.filter(discordID => !onlineBots.some(bot => bot.discord_id === discordID.discord_id));
+        const availableDiscordIDs = discordIDs.filter(discordID => discordID.active == true).filter(discordID => !onlineBots.some(bot => Number(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)