Fix default device PA ID

app/internal/NoiseGatev2.py

@@ -1,15 +1,15 @@
 import audioop
+import logging
 import math
 import time
 
 import pyaudio
 import discord
 import numpy
-from internal.logger import create_logger
 
 voice_connection = None
 
-LOGGER = create_logger(__name__)
+LOGGER = logging.getLogger("Discord_Radio_Bot.NoiseGateV2")
 
 
 # noinspection PyUnresolvedReferences
@@ -30,15 +30,15 @@ class AudioStream:
             if _input:
                 self.paInstance_kwargs['input_device_index'] = _input_device_index
             else:
-                LOGGER.warning("[AudioStream.__init__]:\tInput was not enabled."
-                               " Reinitialize with '_input=True'")
+                LOGGER.warning(f"[AudioStream.__init__]:\tInput was not enabled."
+                               f" Reinitialize with '_input=True'")
 
         if _output_device_index:
             if _output:
                 self.paInstance_kwargs['output_device_index'] = _output_device_index
             else:
-                LOGGER.warning("[AudioStream.__init__]:\tOutput was not enabled."
-                               " Reinitialize with '_output=True'")
+                LOGGER.warning(f"[AudioStream.__init__]:\tOutput was not enabled."
+                               f" Reinitialize with '_output=True'")
 
         if _init_on_startup:
             # Init PyAudio instance
@@ -59,15 +59,15 @@ class AudioStream:
             if self.paInstance_kwargs['input']:
                 self.paInstance_kwargs['input_device_index'] = _new_input_device_index
             else:
-                LOGGER.warning("[AudioStream.init_stream]:\tInput was not enabled when initialized."
-                               " Reinitialize with '_input=True'")
+                LOGGER.warning(f"[AudioStream.init_stream]:\tInput was not enabled when initialized."
+                               f" Reinitialize with '_input=True'")
 
         if _new_output_device_index:
             if self.paInstance_kwargs['output']:
                 self.paInstance_kwargs['output_device_index'] = _new_output_device_index
             else:
-                LOGGER.warning("[AudioStream.init_stream]:\tOutput was not enabled when initialized."
-                               " Reinitialize with '_output=True'")
+                LOGGER.warning(f"[AudioStream.init_stream]:\tOutput was not enabled when initialized."
+                               f" Reinitialize with '_output=True'")
 
         self.close_if_open()
 
@@ -80,7 +80,7 @@ class AudioStream:
             if self.stream.is_active():
                 self.stream.stop_stream()
                 self.stream.close()
-                LOGGER.debug("[ReopenStream.close_if_open]:\t Stream was open; It was closed.")
+                LOGGER.debug(f"[ReopenStream.close_if_open]:\t Stream was open; It was closed.")
 
     def list_devices(self, _display_input_devices: bool = True, _display_output_devices: bool = True):
         LOGGER.info('Getting a list of the devices connected')
@@ -126,7 +126,7 @@ class NoiseGate(AudioStream):
     def run(self) -> None:
         global voice_connection
         # Start the audio stream
-        LOGGER.debug("Starting stream")
+        LOGGER.debug(f"Starting stream")
         self.stream.start_stream()
         # Start the stream to discord
         self.core()
@@ -139,15 +139,15 @@ class NoiseGate(AudioStream):
             time.sleep(.2)
 
         if not voice_connection.is_playing():
-            LOGGER.debug("Playing stream to discord")
+            LOGGER.debug(f"Playing stream to discord")
             voice_connection.play(self.NGStream, after=self.core)
 
     async def close(self):
-        LOGGER.debug("Closing")
+        LOGGER.debug(f"Closing")
         await voice_connection.disconnect()
         if self.stream.is_active:
             self.stream.stop_stream()
-            LOGGER.debug("Stopping stream")
+            LOGGER.debug(f"Stopping stream")
 
 
 # noinspection PyUnresolvedReferences
@@ -155,7 +155,7 @@ class NoiseGateStream(discord.AudioSource):
     def __init__(self, _stream):
         super(NoiseGateStream, self).__init__()
         self.stream = _stream       # The actual audio stream object
-        self.NG_fadeout = 240 / 20    # Fadeout value used to hold the noisegate after de-triggering
+        self.NG_fadeout = 240/20    # Fadeout value used to hold the noisegate after de-triggering
         self.NG_fadeout_count = 0   # A count set when the noisegate is triggered and was de-triggered
         self.process_set_count = 0  # Counts how many processes have been made
 

app/internal/bot_manager.py

@@ -1,179 +1,336 @@
-import asyncio
+import argparse
 import platform
 import os
-from discord import VoiceClient, VoiceChannel, opus, Activity, ActivityType, Intents
+import asyncio
+import discord
 from discord.ext import commands
-from typing import Optional, Dict
-from internal.NoiseGatev2 import NoiseGate
-from internal.logger import create_logger
+from internal.NoiseGatev2 import NoiseGate # Assuming NoiseGatev2.py is in the same directory
 
-LOGGER = create_logger(__name__)
+# --- Opus Library Loading ---
+def load_opus():
+    """Loads the correct opus library for the operating system."""
+    try:
+        script_dir = os.path.dirname(os.path.abspath(__file__))
+        if os.name == 'nt':
+            processor = platform.machine()
+            if processor == "AMD64":
+                print("Loaded OPUS library for Windows AMD64")
+                discord.opus.load_opus(os.path.join(script_dir, './opus/libopus_amd64.dll'))
+            else:
+                print(f"Unsupported Windows processor: {processor}. Opus may not work.")
+        else:
+            processor = platform.machine()
+            print(f"Processor: {processor}")
+            if processor == "aarch64":
+                print("Loaded OPUS library for aarch64")
+                discord.opus.load_opus(os.path.join(script_dir, './opus/libopus_aarcch64.so'))
+            elif processor == "armv7l":
+                print("Loaded OPUS library for armv7l")
+                discord.opus.load_opus(os.path.join(script_dir, './opus/libopus_armv7l.so'))
+            else:
+                print(f"Attempting to load a generic opus library for {processor}")
+                discord.opus.load_opus(os.path.join(script_dir, './opus/libopus.so.0'))
 
-# Configure discord intents
-intents = Intents.default()
-intents.voice_states = True
-intents.guilds = True
+        if discord.opus.is_loaded():
+            print("Opus library loaded successfully.")
+            return True
+        else:
+            print("Opus library failed to load.")
+            return False
 
-class DiscordBotManager:
-    def __init__(self):
-        self.bot: Optional[commands.Bot] = None
-        self.bot_task: Optional[asyncio.Task] = None
-        self.voice_clients: Dict[int, VoiceClient] = {}
-        self.token: Optional[str] = None
-        self.loop = asyncio.get_event_loop()
-        self.lock = asyncio.Lock()
-        self._ready_event = asyncio.Event()
-        self._voice_ready_event = asyncio.Event()
+    except Exception as e:
+        print(f"Error loading opus library: {e}")
+        return False
 
-    async def start_bot(self, token: str):
-        async with self.lock:
-            if self.bot and not self.bot.is_closed():
-                raise RuntimeError("Bot is already running.")
-            if self.bot_task and not self.bot_task.done():
-                raise RuntimeError("Bot is already running.")
+# --- Voice Cog for Multi-Server Management ---
+class VoiceCog(commands.Cog):
+    """Cog to handle all voice-related commands and state management."""
+    def __init__(self, bot, device_id, ng_threshold):
+        self.bot = bot
+        self.device_id = device_id
+        self.ng_threshold = ng_threshold
+        self.voice_states = {} # { guild_id: NoiseGate_instance }
 
-            self.token = token
-            self.bot = commands.Bot(command_prefix="!", intents=intents)
+    @commands.Cog.listener()
+    async def on_ready(self):
+        print(f'Logged in as {self.bot.user} (ID: {self.bot.user.id})')
+        print('------')
 
-            @self.bot.event
-            async def on_ready():
-                LOGGER.info(f'Logged in as {self.bot.user}')
-                # Set the event when on_ready is called
-                self._ready_event.set()
+    # Internal API method to join a voice channel
+    async def internal_join_voice_channel(self, guild_id: int, channel_id: int):
+        guild = self.bot.get_guild(guild_id)
+        if not guild:
+            print(f"Guild with ID {guild_id} not found.")
+            return False
 
-            @self.bot.event
-            async def on_voice_state_update(member, before, after):
-                # Check if the bot was disconnected
-                if member == self.bot.user and after.channel is None:
-                    guild_id = before.channel.guild.id
-                    if not self.voice_clients.get(guild_id):
-                        LOGGER.info("Bot has left channel, reconnection ignored.")
-                        return
-                    LOGGER.info(f"Bot was disconnected from channel in guild {guild_id}. Attempting to reconnect...")
-                    try:
-                        await self.leave_voice_channel(guild_id)
-                    except Exception as e:
-                        LOGGER.warning(f"Error leaving voice channel: '{e}'")
-                    # Attempt to reconnect to the channel after a brief pause
-                    await asyncio.sleep(2)
-                    await self.join_voice_channel(guild_id, before.channel.id)
+        channel = guild.get_channel(channel_id)
+        if not channel or not isinstance(channel, discord.VoiceChannel):
+            print(f"Voice channel with ID {channel_id} not found in guild {guild.name}.")
+            return False
 
-                if member == self.bot.user and before.channel is None and after.channel is not None:
-                    print(f"{member.name} joined voice channel {after.channel.name}")
-                    self._voice_ready_event.set()
+        # Get voice client for this guild
+        current_voice_client = discord.utils.get(self.bot.voice_clients, guild=guild)
 
-            # Load Opus for the current CPU
-            await self.load_opus()
+        if current_voice_client:
+            if current_voice_client.channel == channel:
+                print(f"Already in channel: {channel.name} in guild {guild.name}.")
+                voice_client_to_use = current_voice_client # Use existing
+            else:
+                await current_voice_client.move_to(channel)
+                print(f"Moved to channel: {channel.name} in guild {guild.name}.")
+                voice_client_to_use = current_voice_client # Use moved existing
+        else:
+            try:
+                voice_client_to_use = await channel.connect(timeout=60.0, reconnect=True)
+                print(f"Connected to channel: {channel.name} in guild {guild.name}.")
+            except Exception as e:
+                print(f"Failed to connect to {channel.name} in guild {guild.name}. Error: {e}")
+                return False
 
-            # Create the task to run the bot in the background
-            self.bot_task = self.loop.create_task(self.bot.start(token))
+        if not voice_client_to_use:
+            print(f"Failed to obtain a valid VoiceClient object for guild {guild.name}.")
+            return False
 
-        # Wait for the on_ready event to be set by the bot task
-        LOGGER.info("Waiting for bot to become ready...")
-        try:
-            await asyncio.wait_for(self._ready_event.wait(), timeout=60.0)
-            LOGGER.info("Bot is ready, start_bot returning.")
-            return
-        except asyncio.TimeoutError:
-            LOGGER.error("Timeout waiting for bot to become ready. Bot might have failed to start.")
-            if self.bot_task and not self.bot_task.done():
-                self.bot_task.cancel()
-            raise RuntimeError("Bot failed to become ready within timeout.")
+        print("Selected voice client to use.")
 
-    async def stop_bot(self):
-        async with self.lock:
-            if self.bot:
-                await self.bot.close()
-                self.bot = None
-            if self.bot_task:
-                await self.bot_task
-                self.bot_task = None
-            self.voice_clients.clear()
-            self._ready_event.clear()
-            LOGGER.info("Bot has been stopped.")
+        if discord.opus.is_loaded():
+            # Create and start the NoiseGate audio stream for this server
+            # Ensure the correct voice client is passed
+            stream_handler = NoiseGate(
+                _voice_connection=voice_client_to_use, # Corrected: use the unified variable
+                _noise_gate_threshold=self.ng_threshold,
+                _input_device_index=self.device_id
+            )
+            self.voice_states[guild.id] = stream_handler
+            stream_handler.run()
+            print(f"Started audio stream for server: {guild.name}")
+            return True
+        else:
+            print("Opus library not loaded. Cannot start audio stream.")
+            # Disconnect if opus isn't loaded but a connection was made
+            if voice_client_to_use:
+                await voice_client_to_use.disconnect()
+            return False
 
-    async def join_voice_channel(self, guild_id: int, channel_id: int, ng_threshold: int = 50, device_id: int = 4):
-        if not self.bot:
-            raise RuntimeError("Bot is not running.")
+    # Internal API method to leave a voice channel
+    async def internal_leave_voice_channel(self, guild_id: int):
+        if guild_id not in self.voice_states:
+            print(f"Not currently in a voice channel on guild ID {guild_id}.")
+            return False
 
         guild = self.bot.get_guild(guild_id)
         if not guild:
-            raise ValueError("Guild not found.")
+            print(f"Guild with ID {guild_id} not found.")
+            return False
 
-        if not opus.is_loaded():
-            raise RuntimeError("Opus is not loaded.")
+        voice_client = discord.utils.get(self.bot.voice_clients, guild=guild)
 
-        channel = guild.get_channel(channel_id)
-        if not isinstance(channel, VoiceChannel):
-            raise ValueError("Channel is not a voice channel.")
+        if not voice_client:
+            print(f"Bot not in a voice channel in guild {guild.name}, but state exists. Cleaning up.")
+            del self.voice_states[guild.id]
+            return True
 
-        if guild_id in self.voice_clients:
-            raise RuntimeError("Already connected to this guild's voice channel.")
+        stream_handler = self.voice_states[guild.id]
+        await stream_handler.close() # Close the NoiseGate stream
+        del self.voice_states[guild.id]
+        print(f"Disconnected and stopped the audio stream for guild: {guild.name}")
+        return True
 
-        try:
-            voice_client = await channel.connect(timeout=60.0, reconnect=True)
-            LOGGER.debug("Voice Connected.")
-            streamHandler = NoiseGate(
-                _input_device_index=device_id,
-                _voice_connection=voice_client,
-                _noise_gate_threshold=ng_threshold)
-            streamHandler.run()
-            LOGGER.debug("Stream is running.")
-            self.voice_clients[guild_id] = voice_client
-            LOGGER.info(f"Joined guild {guild_id} voice channel {channel_id} and stream is running.")
-        except Exception as e:
-            LOGGER.error(f"Failed to connect to voice channel: {e}")
+    # Discord command for joining (for direct user interaction)
+    @commands.command(name='join')
+    async def join_command(self, ctx, *, channel: discord.VoiceChannel = None):
+        if not channel:
+            if ctx.author.voice:
+                channel = ctx.author.voice.channel
+            else:
+                await ctx.send("You are not connected to a voice channel. Please specify one to join.")
+                return
 
-        LOGGER.info("Waiting for bot to join voice...")
-        try:
-            await asyncio.wait_for(self._voice_ready_event.wait(), timeout=60.0)
-            LOGGER.info("Bot joined voice, returning.")
+        success = await self.internal_join_voice_channel(ctx.guild.id, channel.id)
+        if success:
+            await ctx.send(f"Connected to channel: {channel.name}.")
+        else:
+            await ctx.send(f"Failed to connect to {channel.name}.")
+
+    # Discord command for leaving (for direct user interaction)
+    @commands.command(name='leave')
+    async def leave_command(self, ctx):
+        success = await self.internal_leave_voice_channel(ctx.guild.id)
+        if success:
+            await ctx.send("Disconnected and stopped the audio stream.")
+        else:
+            await ctx.send("I am not currently in a voice channel on this server.")
+
+    @join_command.before_invoke
+    async def ensure_opus(self, ctx):
+        if not discord.opus.is_loaded():
+            await ctx.send("Opus audio library is not loaded. I cannot join a voice channel.")
+            raise commands.CommandError("Opus not loaded.")
+# --- Discord Bot Manager Class ---
+class DiscordBotManager:
+    def __init__(self, device_id: int = 1, ng_threshold: int = 50):
+        self.token = None
+        self.device_id = device_id
+        self.ng_threshold = ng_threshold
+        self.bot = None
+        self.voice_cog = None
+        self._bot_task = None # To hold the running bot task for graceful stopping
+
+    async def _setup_bot(self):
+        # Define bot intents
+        intents = discord.Intents.default()
+        intents.message_content = True # Required for commands
+        intents.guilds = True # Required to get guild objects by ID
+        intents.voice_states = True # Required to get voice channel info
+
+        self.bot = commands.Bot(command_prefix='!', intents=intents)
+        self.voice_cog = VoiceCog(self.bot, self.device_id, self.ng_threshold)
+        await self.bot.add_cog(self.voice_cog)
+
+        @self.bot.event
+        async def on_ready():
+            if not load_opus():
+                print("Failed to load Opus library. Bot cannot start voice features.")
+                return
+            print(f'Bot fully ready: {self.bot.user}')
+            # Set initial presence when the bot is ready
+            await self.set_presence("Broadcasting...", discord.Game)
+
+    async def start_bot(self, token: str):
+        if self.bot and self.bot.is_ready():
+            print("Bot is already running.")
             return
-        except asyncio.TimeoutError:
-            LOGGER.error("Timeout waiting for bot to join voice.")
-            raise RuntimeError("Bot failed to join voice within timeout.")
+        
+        self.token = token
+
+        await self._setup_bot()
+
+        print("Starting bot...")
+        try:
+            # Run the bot in a separate task so we can control it
+            self._bot_task = asyncio.create_task(self.bot.start(self.token))
+            # Wait for the bot to connect (optional, useful for ensuring it's ready)
+            await self.bot.wait_until_ready()
+            print("Bot started and is ready.")
+        except discord.LoginFailure:
+            print("Failed to login to Discord. Check your client ID (token).")
+        except Exception as e:
+            print(f"An error occurred while starting the bot: {e}")
+
+    async def stop_bot(self):
+        if not self.bot or not self.bot.is_ready():
+            print("Bot is not running or not ready.")
+            return
+
+        print("Stopping bot...")
+        # Clean up all active voice connections before stopping
+        for guild_id in list(self.voice_cog.voice_states.keys()):
+            await self.voice_cog.internal_leave_voice_channel(guild_id)
+
+        await self.bot.close()
+        if self._bot_task:
+            self._bot_task.cancel() # Cancel the bot's running task
+            try:
+                await self._bot_task # Await cancellation to ensure cleanup
+            except asyncio.CancelledError:
+                pass
+        print("Bot stopped.")
+        self.bot = None # Reset bot instance
+
+    async def join_voice_channel(self, guild_id: int, channel_id: int):
+        if not self.bot or not self.bot.is_ready():
+            print("Bot is not running or ready. Cannot join voice channel.")
+            return False
+        return await self.voice_cog.internal_join_voice_channel(guild_id, channel_id)
 
     async def leave_voice_channel(self, guild_id: int):
-        if not self.bot:
-            raise RuntimeError("Bot is not running.")
+        if not self.bot or not self.bot.is_ready():
+            print("Bot is not running or ready. Cannot leave voice channel.")
+            return False
+        return await self.voice_cog.internal_leave_voice_channel(guild_id)
 
-        voice_client = self.voice_clients.get(guild_id)
-        if not voice_client:
-            raise RuntimeError("Not connected to the specified guild's voice channel.")
-
-        await voice_client.disconnect()
-        del self.voice_clients[guild_id]
-        LOGGER.info(f"Left guild {guild_id} voice channel.")
-
-    async def load_opus(self):
-        """ Load the proper OPUS library for the device being used """
-        processor = platform.machine()
-        script_dir = os.path.dirname(os.path.abspath(__file__))
-        LOGGER.debug("Processor: ", processor)
-        if os.name == 'nt':
-            if processor == "AMD64":
-                opus.load_opus(os.path.join(script_dir, './opus/libopus_amd64.dll'))
-                LOGGER.info("Loaded OPUS library for AMD64")
-                return "AMD64"
-        else:
-            if processor == "aarch64":
-                opus.load_opus(os.path.join(script_dir, './opus/libopus_aarcch64.so'))
-                LOGGER.info("Loaded OPUS library for aarch64")
-                return "aarch64"
-            elif processor == "armv7l":
-                opus.load_opus(os.path.join(script_dir, './opus/libopus_armv7l.so'))
-                LOGGER.info("Loaded OPUS library for armv7l")
-                return "armv7l"
-
-    async def set_presence(self, system_name: str):
-        """ Set the presence (activity) of the bot """
-        if not self.bot:
-            LOGGER.warning("Bot is not running, cannot set presence.")
+    async def set_presence(self, name: str, activity_type: discord.Activity = discord.ActivityType.listening):
+        if not self.bot or not self.bot.is_ready():
+            print("Bot is not running or ready. Cannot set presence.")
             return
 
         try:
-            activity = Activity(type=ActivityType.listening, name=system_name)
+            if activity_type == discord.Game:
+                activity = discord.Game(name=name)
+            elif activity_type == discord.Streaming:
+                activity = discord.Streaming(name=name, url="https://twitch.tv/your_stream_url_here") # Replace with actual URL
+            elif activity_type == discord.ActivityType.listening:
+                activity = discord.Activity(type=discord.ActivityType.listening, name=name)
+            elif activity_type == discord.ActivityType.watching:
+                activity = discord.Activity(type=discord.ActivityType.watching, name=name)
+            else:
+                print(f"Invalid activity type: {activity_type}. Defaulting to Game.")
+                activity = discord.Game(name=name)
+
             await self.bot.change_presence(activity=activity)
-            LOGGER.info(f"Bot presence set to 'Listening to {system_name}'")
-        except Exception as pe:
-            LOGGER.error(f"Unable to set presence: '{pe}'")
+            print(f"Presence set to: {name} ({activity_type.__name__})")
+        except Exception as e:
+            print(f"Error setting presence: {e}")
+
+# --- Example Usage / Main Entry Point ---
+async def main_run():
+    parser = argparse.ArgumentParser(description="Discord Radio Bot Manager.")
+    parser.add_argument("clientId", type=str, help="The Discord bot's client token.")
+    parser.add_argument("deviceId", type=int, help="The ID of the audio input device to use.")
+    parser.add_argument("-n", "--NGThreshold", type=int, default=50, help="The noise gate threshold (default: 50).")
+    args = parser.parse_args()
+
+    # Instantiate the bot manager
+    bot_manager = DiscordBotManager(args.clientId, args.deviceId, args.NGThreshold)
+
+    # --- Start the bot ---
+    await bot_manager.start_bot()
+
+    # --- Example of how an external system (like your websocket) would interact ---
+    # You would replace this with your actual websocket logic
+    print("\nBot is running. You can now use internal_api calls or Discord commands.")
+    print("Example: Use !join <channel_id> in Discord.")
+    print("Example: Use !leave in Discord.")
+    print("Example: Simulating an external request to join a channel after 10 seconds...")
+
+    await asyncio.sleep(10) # Simulate delay
+
+    # Placeholder for guild_id and channel_id from your websocket server
+    # You would receive these from your websocket server
+    # For testing, you'll need to manually get a guild ID and channel ID where your bot is.
+    example_guild_id = 123456789012345678 # <<< REPLACE WITH AN ACTUAL GUILD ID
+    example_channel_id = 987654321098765432 # <<< REPLACE WITH AN ACTUAL VOICE CHANNEL ID
+
+    print(f"\nAttempting to join voice channel {example_channel_id} in guild {example_guild_id} via internal API...")
+    success_join = await bot_manager.join_voice_channel(example_guild_id, example_channel_id)
+    print(f"Internal join successful: {success_join}")
+
+    await asyncio.sleep(15) # Stay in channel for a bit
+
+    print("\nAttempting to leave voice channel via internal API...")
+    success_leave = await bot_manager.leave_voice_channel(example_guild_id)
+    print(f"Internal leave successful: {success_leave}")
+
+    await asyncio.sleep(5)
+
+    print("\nChanging bot presence to 'Streaming music'...")
+    await bot_manager.set_presence("Streaming music", discord.Streaming)
+
+    await asyncio.sleep(5)
+
+    print("\nChanging bot presence back to 'Idle'...")
+    await bot_manager.set_presence("Idle", discord.Game)
+
+
+    # Keep the bot running indefinitely until an external stop command or script exit
+    try:
+        while True:
+            await asyncio.sleep(3600) # Sleep for an hour, or until interrupted
+    except KeyboardInterrupt:
+        print("\nKeyboardInterrupt detected. Stopping bot...")
+    finally:
+        await bot_manager.stop_bot()
+
+
+if __name__ == "__main__":
+    asyncio.run(main_run())

app/routers/bot.py

@@ -50,7 +50,7 @@ def create_bot_router(bot_manager: DiscordBotManager):
     async def get_status():
         status = {
             "bot_running": bot_manager.bot is not None and not bot_manager.bot.is_closed(),
-            "connected_guilds": list(bot_manager.voice_clients.keys()),
+            "connected_guilds": list(bot_manager.voice_cog.voice_states.keys()) if bot_manager.bot else {},
             "active_token": bot_manager.token
         }
         return status