Trying to resolve discord functions to see if audio works there but just not being relayed to liq

Reviewed-on: #3

.env.example

@@ -1,5 +1,9 @@
 NODE_ID=
 MQTT_BROKER=
 ICECAST_SERVER=
+AUDIO_BUCKET=
 NODE_LAT=
-NODE_LONG=
+NODE_LONG=
+HTTP_SERVER_PROTOCOL=
+HTTP_SERVER_ADDRESS=
+HTTP_SERVER_PORT=

.gitignore

@@ -2,4 +2,5 @@
 *.log
 *.db
 *.conf
-configs/*
+configs/*
+*.json

Dockerfile

@@ -7,7 +7,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Install system dependencies
 RUN apt-get update && \
     apt-get upgrade -y && \ 
-    apt-get install git pulseaudio pulseaudio-utils liquidsoap -y
+    apt-get install git pulseaudio pulseaudio-utils liquidsoap ffmpeg -y
 
 # Clone the boatbod op25 repository
 RUN git clone -b gr310 https://github.com/boatbod/op25 /op25
@@ -34,6 +34,9 @@ EXPOSE 8001 8081
 # Create and set up the configuration directory
 VOLUME ["/configs"]
 
+# Create the calls local cache directory
+VOLUME ["/calls"]
+
 # Set the working directory in the container
 WORKDIR /app
 

app/internal/discord_radio.py

@@ -0,0 +1,230 @@
+import discord
+import asyncio
+import socket
+import threading
+import subprocess
+import shlex
+import time
+from internal.logger import create_logger
+from collections import deque
+from typing import Optional, List
+
+LOGGER = create_logger(__name__)
+
+class UDPAudioSource(discord.AudioSource):
+    """
+    A custom Discord AudioSource that reads raw PCM audio from a thread-safe buffer.
+    It pipes the raw 8000Hz 16-bit audio into FFmpeg to convert it to
+    Discord's required 48000Hz stereo Opus format.
+    """
+    def __init__(self, buffer: deque):
+        self.buffer = buffer
+        # We start an FFmpeg process that reads from stdin (pipe) and outputs raw PCM (s16le) at 48k
+        self.ffmpeg_process = subprocess.Popen(
+            shlex.split(
+                "ffmpeg -f s16le -ar 8000 -ac 1 -i pipe:0 -f s16le -ar 48000 -ac 2 pipe:1 -loglevel panic"
+            ),
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE
+        )
+        self._buffer_lock = threading.Lock()
+
+    def read(self) -> bytes:
+        """
+        Reads 20ms of audio from the buffer, feeds it to ffmpeg, 
+        and returns the converted bytes to Discord.
+        """
+        # Discord requests 20ms of audio. 
+        # At 8000Hz 16-bit mono, 1 second = 16000 bytes. 20ms = 320 bytes.
+        chunk_size = 320 
+        
+        data = b''
+        
+        # Pull data from the UDP thread buffer
+        with self._buffer_lock:
+            if len(self.buffer) >= chunk_size:
+                # Optimized deque slicing
+                data = bytes([self.buffer.popleft() for _ in range(chunk_size)])
+            else:
+                # If we don't have enough data (buffer underrun), send silence to keep pipe open
+                data = b'\x00' * chunk_size
+
+        try:
+            # Write raw 8k mono to ffmpeg stdin
+            self.ffmpeg_process.stdin.write(data)
+            self.ffmpeg_process.stdin.flush()
+            
+            # Read converted 48k stereo from ffmpeg stdout
+            # 48000 Hz * 2 channels * 2 bytes (16bit) * 0.02s = 3840 bytes
+            converted_data = self.ffmpeg_process.stdout.read(3840)
+            return converted_data
+        except Exception as e:
+            LOGGER.error(f"Error in FFmpeg conversion: {e}")
+            return b'\x00' * 3840
+
+    def cleanup(self):
+        if self.ffmpeg_process:
+            try:
+                self.ffmpeg_process.stdin.close()
+                self.ffmpeg_process.terminate()
+            except:
+                pass
+
+class DiscordRadioBot(discord.Client):
+    """
+    A dedicated Discord Client for streaming Radio traffic.
+    
+    Features:
+    - Independent UDP Listener (non-blocking)
+    - Packet Forwarding (to keep Liquidsoap/Icecast working)
+    - Manual Channel Move detection
+    - Dynamic Token/Channel joining
+    - Debug Stats logging
+    """
+    def __init__(self, listen_port=23456, forward_ports: List[int] = None):
+        intents = discord.Intents.default()
+        super().__init__(intents=intents)
+        
+        self.listen_port = listen_port
+        self.forward_ports = forward_ports or [] 
+        
+        self.audio_buffer = deque(maxlen=160000) # Buffer ~10 seconds of audio
+        self.udp_sock = None
+        self.running = False
+        self.voice_client: Optional[discord.VoiceClient] = None
+        
+        # Debug Stats
+        self.packets_received = 0
+        self.packets_forwarded = 0
+        self.last_log_time = time.time()
+        
+        # Start the UDP Listener in a separate daemon thread immediately
+        self.udp_thread = threading.Thread(target=self._udp_listener_loop, daemon=True)
+        self.udp_thread.start()
+
+    def _udp_listener_loop(self):
+        """
+        Runs in a background thread. Listens for UDP packets from OP25.
+        """
+        self.udp_sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        # Bind to all interfaces to ensure we catch the OP25 stream
+        self.udp_sock.bind(('0.0.0.0', self.listen_port))
+        self.udp_sock.settimeout(1.0)
+        
+        LOGGER.info(f"UDP Audio Bridge listening on 0.0.0.0:{self.listen_port}")
+        LOGGER.info(f"Forwarding audio to: {self.forward_ports}")
+
+        # Create sockets for each forward port
+        forward_targets = []
+        for port in self.forward_ports:
+            s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+            forward_targets.append((s, port))
+
+        self.running = True
+        while self.running:
+            try:
+                data, addr = self.udp_sock.recvfrom(4096)
+                self.packets_received += 1
+                
+                # 1. Forward to Liquidsoap/audio.py
+                for sock, port in forward_targets:
+                    try:
+                        sock.sendto(data, ('127.0.0.1', port))
+                        self.packets_forwarded += 1
+                    except Exception as fe:
+                        # Log forwarding errors only once per 5 seconds to avoid spam
+                        if self.packets_forwarded % 100 == 0:
+                            LOGGER.error(f"Forward error to port {port}: {fe}")
+                
+                # 2. Add to Discord Buffer
+                self.audio_buffer.extend(data)
+                
+                # Periodic Stats Logging
+                if time.time() - self.last_log_time > 10:
+                    if self.packets_received > 0:
+                        LOGGER.info(f"Discord Audio Bridge Stats: Received {self.packets_received} packets, Forwarded {self.packets_forwarded}")
+                    self.packets_received = 0
+                    self.packets_forwarded = 0
+                    self.last_log_time = time.time()
+                
+            except socket.timeout:
+                continue
+            except Exception as e:
+                LOGGER.error(f"UDP Listener Error: {e}")
+                time.sleep(0.1)
+
+    async def on_ready(self):
+        LOGGER.info(f'Discord Radio Bot connected as {self.user}')
+
+    async def on_voice_state_update(self, member, before, after):
+        """
+        Handles manual moves.
+        """
+        if member.id == self.user.id:
+            if after.channel is not None and before.channel != after.channel:
+                LOGGER.info(f"Bot was moved to channel: {after.channel.name}")
+                self.voice_client = member.guild.voice_client
+
+    async def start_session(self, token: str, channel_id: int):
+        """
+        Connects the bot to Discord and joins the specified channel.
+        """
+        asyncio.create_task(self.start(token))
+        
+        # Wait for login to complete
+        for _ in range(20):
+            if self.is_ready():
+                break
+            await asyncio.sleep(0.5)
+            
+        try:
+            channel = self.get_channel(int(channel_id))
+            if not channel:
+                channel = await self.fetch_channel(int(channel_id))
+                
+            if channel:
+                self.voice_client = await channel.connect()
+                LOGGER.info(f"Joined voice channel: {channel.name}")
+            else:
+                LOGGER.error(f"Could not find channel ID: {channel_id}")
+        except Exception as e:
+            LOGGER.error(f"Failed to join voice: {e}")
+
+    async def stop_session(self):
+        """
+        Disconnects voice and closes the bot connection.
+        """
+        if self.voice_client:
+            await self.voice_client.disconnect()
+        await self.close()
+
+    def update_system_presence(self, system_name: str):
+        """
+        Updates the "Playing..." status of the bot.
+        """
+        activity = discord.Activity(
+            type=discord.ActivityType.listening, 
+            name=f"{system_name}"
+        )
+        asyncio.create_task(self.change_presence(activity=activity))
+
+    def start_transmission(self):
+        """
+        Called when a radio call STARTS.
+        Connects the audio buffer to the voice stream.
+        This turns the green ring ON.
+        """
+        if self.voice_client and not self.voice_client.is_playing():
+            # Clear old audio so we don't start with a delay
+            self.audio_buffer.clear()
+            source = UDPAudioSource(self.audio_buffer)
+            self.voice_client.play(source)
+
+    def stop_transmission(self):
+        """
+        Called when a radio call ENDS.
+        Stops the stream.
+        This turns the green ring OFF.
+        """
+        if self.voice_client and self.voice_client.is_playing():
+            self.voice_client.stop()

app/internal/op25_config_utls.py

@@ -153,6 +153,6 @@ def get_current_system_from_config() -> str:
     if not data:
         return None
     try:
-        return data.get("trunking", {}).get("sysname", "Unknown System")
+        return data.get("trunking", {}).get("chans", [{}])[0].get("sysname", "Unknown System")
     except:
         return "Unknown System"

app/models/models.py

@@ -38,7 +38,7 @@ class ChannelConfig(BaseModel):
     cqpsk_tracking: Optional[bool] = None
     frequency: Optional[float] = None
     nbfmSquelch: Optional[float] = None
-    destination: Optional[str] = "udp://127.0.0.1:23456"
+    destination: Optional[str] = "udp://127.0.0.1:23457"
     tracking_threshold: Optional[int] = 120
     tracking_feedback: Optional[float] = 0.75
     excess_bw: Optional[float] = 0.2

app/node_main.py

@@ -9,6 +9,7 @@ from internal.logger import create_logger
 from internal.op25_config_utls import scan_local_library
 import paho.mqtt.client as mqtt
 import requests
+from internal.discord_radio import DiscordRadioBot
 
 # Initialize logging
 LOGGER = create_logger(__name__)
@@ -20,12 +21,21 @@ app.include_router(create_op25_router(), prefix="/op25")
 # Configuration
 NODE_ID = os.getenv("NODE_ID", "standalone-node")
 MQTT_BROKER = os.getenv("MQTT_BROKER", None)
+HTTP_SERVER_PROTOCOL = os.getenv("HTTP_SERVER_PROTOCOL", "http")
+HTTP_SERVER_ADDRESS = os.getenv("HTTP_SERVER_ADDRESS", "127.0.0.1")
+HTTP_SERVER_PORT = os.getenv("HTTP_SERVER_PORT", 8000)
 NODE_LAT = os.getenv("NODE_LAT")
 NODE_LONG = os.getenv("NODE_LONG")
 
 # Global flag to track MQTT connection state
 MQTT_CONNECTED = False
 
+# Global variable to hold the main event loop
+main_loop = None
+
+# Initialize the Discord Bot
+discord_bot = DiscordRadioBot(listen_port=23457, forward_ports=[23456])
+
 def handle_c2_command(topic, payload):
     """
     Parses and routes commands received from the C2 server by calling the
@@ -102,6 +112,23 @@ def handle_c2_command(topic, payload):
             except requests.exceptions.RequestException as e:
                 LOGGER.error(f"Failed to connect to OP25 terminal for tuning: {e}")
             
+        elif command_type == "discord_join":
+            token = data.get("token")
+            channel_id = data.get("channel_id")
+            if token and channel_id:
+                if main_loop and main_loop.is_running():
+                    asyncio.run_coroutine_threadsafe(discord_bot.start_session(token, channel_id), main_loop)
+                else:
+                    LOGGER.error("Main event loop not available to start Discord session.")
+                LOGGER.info("Initiating Discord Session...")
+
+        elif command_type == "discord_leave":
+            if main_loop and main_loop.is_running():
+                asyncio.run_coroutine_threadsafe(discord_bot.stop_session(), main_loop)
+            else:
+                LOGGER.error("Main event loop not available to stop Discord session.")
+            LOGGER.info("Ending Discord Session...")
+        
         else:
             LOGGER.warning(f"Unknown command type received: {command_type}")
             
@@ -112,6 +139,37 @@ def handle_c2_command(topic, payload):
     except Exception as e:
         LOGGER.error(f"Error processing C2 command: {e}")
 
+def get_current_stream_url():
+    """
+    Dynamically resolves the audio stream URL from the active OP25 configuration.
+    Falls back to env var or default if config is missing/invalid.
+    """
+    default_url = os.getenv("STREAM_URL", "http://127.0.0.1:8000/stream_0")
+    config_path = "/configs/active.cfg.json"
+    
+    if not os.path.exists(config_path):
+        return default_url
+        
+    try:
+        with open(config_path, "r") as f:
+            config = json.load(f)
+        
+        streams = config.get("metadata", {}).get("streams", [])
+        if not streams:
+            return default_url
+            
+        stream = streams[0]
+        address = stream.get("icecastServerAddress", "127.0.0.1:8000")
+        mount = stream.get("icecastMountpoint", "stream_0")
+        
+        if not mount.startswith("/"):
+            mount = f"/{mount}"
+            
+        return f"http://{address}{mount}"
+    except Exception as e:
+        LOGGER.warning(f"Failed to resolve stream URL from config: {e}")
+        return default_url
+
 async def mqtt_lifecycle_manager():
     """
     Manages the application-level logic: Check-in, Heartbeats, and Shutdown.
@@ -153,7 +211,7 @@ async def mqtt_lifecycle_manager():
         payload = {
             "node_id": NODE_ID,
             "status": "online",
-            "timestamp": datetime.now().isoformat(),
+            "timestamp": datetime.utcnow().isoformat(),
             "is_listening": op25_status.get("is_running", False),
             "active_system": op25_status.get("active_system"),
             # Only scan library if needed, otherwise it's heavy I/O
@@ -197,6 +255,39 @@ async def mqtt_lifecycle_manager():
         # This is the specific payload the OP25 web interface uses [cite: 45562, 45563]
         COMMAND_PAYLOAD = [{"command": "update", "arg1": 0, "arg2": 0}]
 
+        # Audio Recording State
+        recorder_proc = None
+        current_call_id = None
+
+        async def stop_recording():
+            nonlocal recorder_proc
+            if recorder_proc:
+                if recorder_proc.returncode is None:
+                    recorder_proc.terminate()
+                    try:
+                        await asyncio.wait_for(recorder_proc.wait(), timeout=2.0)
+                    except asyncio.TimeoutError:
+                        recorder_proc.kill()
+                recorder_proc = None
+
+        def upload_audio(call_id):
+            if not MQTT_BROKER: return None
+            local_path = f"/calls/{call_id}.mp3"
+            if not os.path.exists(local_path): return None
+            
+            try:
+                with open(local_path, "rb") as f:
+                    files = {"file": (f"{call_id}.mp3", f, "audio/mpeg")}
+                    response = requests.post(f"{HTTP_SERVER_PROTOCOL}://{HTTP_SERVER_ADDRESS}:{HTTP_SERVER_PORT}/upload", files=files, data={"node_id": NODE_ID, "call_id": call_id}, timeout=30)
+                    response.raise_for_status()
+                    return response.json().get("url")
+            except Exception as e:
+                LOGGER.error(f"Upload failed: {e}")
+                return None
+            finally:
+                if os.path.exists(local_path):
+                    os.remove(local_path)
+
         while True:
             if not MQTT_CONNECTED:
                 await asyncio.sleep(1)
@@ -212,7 +303,7 @@ async def mqtt_lifecycle_manager():
                 
                 if response.status_code == 200:
                     data = response.json()
-                    LOGGER.debug(f"Response from OP25 API: {data}")
+                    # LOGGER.debug(f"Response from OP25 API: {data}")
                     
                     current_tgid = 0
                     current_meta = {}
@@ -240,7 +331,7 @@ async def mqtt_lifecycle_manager():
                                         break
                             if current_tgid: break
 
-                    now = datetime.now()
+                    now = datetime.utcnow()
 
                     # Logic for handling call start/end events
                     if current_tgid != 0:
@@ -248,12 +339,61 @@ async def mqtt_lifecycle_manager():
                         
                         if current_tgid != last_tgid:
                             if last_tgid != 0:
+                                # --- END PREVIOUS CALL ---
+                                await stop_recording()
+                                
+                                # Stop Discord Transmission
+                                if discord_bot.is_ready():
+                                    discord_bot.stop_transmission()
+
+                                audio_url = None
+                                if current_call_id:
+                                    audio_url = await loop.run_in_executor(None, upload_audio, current_call_id)
+
                                 LOGGER.debug(f"Switching TGID: {last_tgid} -> {current_tgid}")
-                                payload = {"node_id": NODE_ID, "timestamp": now.isoformat(), "event": "call_end", "metadata": last_metadata}
+                                payload = {
+                                    "node_id": NODE_ID, 
+                                    "timestamp": now.isoformat(), 
+                                    "event": "call_end", 
+                                    "metadata": last_metadata,
+                                    "audio_url": audio_url,
+                                    "call_id": current_call_id
+                                }
                                 client.publish(f"nodes/{NODE_ID}/metadata", json.dumps(payload), qos=0)
                             
+                            # --- START NEW CALL ---
                             LOGGER.debug(f"Call Start: TGID {current_tgid} ({current_meta.get('alpha_tag')})")
-                            payload = {"node_id": NODE_ID, "timestamp": now.isoformat(), "event": "call_start", "metadata": current_meta}
+
+                            # Trigger Discord Transmission
+                            if discord_bot.is_ready():
+                                discord_bot.start_transmission()
+                                discord_bot.update_system_presence(current_meta.get('sysname', 'Scanning'))
+                            
+                            # Generate ID
+                            start_ts = int(now.timestamp())
+                            sysname = current_meta.get('sysname', 'unknown')
+                            tgid = current_meta.get('tgid', '0')
+                            current_call_id = f"{NODE_ID}_{sysname}_{tgid}_{start_ts}"
+
+                            # Start Recording (FFmpeg)
+                            try:
+                                stream_url = get_current_stream_url()
+                                recorder_proc = await asyncio.create_subprocess_exec(
+                                    "ffmpeg", "-i", stream_url, "-y", "-t", "300", 
+                                    f"/calls/{current_call_id}.mp3",
+                                    stdout=asyncio.subprocess.DEVNULL,
+                                    stderr=asyncio.subprocess.DEVNULL
+                                )
+                            except Exception as e:
+                                LOGGER.error(f"Failed to start recorder: {e}")
+
+                            payload = {
+                                "node_id": NODE_ID, 
+                                "timestamp": now.isoformat(), 
+                                "event": "call_start", 
+                                "metadata": current_meta,
+                                "call_id": current_call_id
+                            }
                             client.publish(f"nodes/{NODE_ID}/metadata", json.dumps(payload), qos=0)
                             last_tgid = current_tgid
                             last_metadata = current_meta
@@ -263,12 +403,31 @@ async def mqtt_lifecycle_manager():
                             LOGGER.debug(f"Signal lost for TGID {last_tgid}. Starting debounce.")
                             potential_end_time = now
                         elif (now - potential_end_time).total_seconds() > DEBOUNCE_SECONDS:
+                            # --- END CALL (Debounce Expired) ---
+                            await stop_recording()
+
+                            # Stop Discord Transmission
+                            if discord_bot.is_ready():
+                                discord_bot.stop_transmission()
+
+                            audio_url = None
+                            if current_call_id:
+                                audio_url = await loop.run_in_executor(None, upload_audio, current_call_id)
+
                             LOGGER.debug(f"Call End (Debounce expired): TGID {last_tgid}")
-                            payload = {"node_id": NODE_ID, "timestamp": now.isoformat(), "event": "call_end", "metadata": last_metadata}
+                            payload = {
+                                "node_id": NODE_ID, 
+                                "timestamp": now.isoformat(), 
+                                "event": "call_end", 
+                                "metadata": last_metadata,
+                                "audio_url": audio_url,
+                                "call_id": current_call_id
+                            }
                             client.publish(f"nodes/{NODE_ID}/metadata", json.dumps(payload), qos=0)
                             last_tgid = 0
                             last_metadata = {}
                             potential_end_time = None
+                            current_call_id = None
                 else:
                     LOGGER.debug(f"OP25 API returned status: {response.status_code}")
 
@@ -315,6 +474,8 @@ async def mqtt_lifecycle_manager():
 
 @app.on_event("startup")
 async def startup_event():
+    global main_loop
+    main_loop = asyncio.get_running_loop()
     # Store the task so we can cancel it if needed (optional)
     app.state.mqtt_task = asyncio.create_task(mqtt_lifecycle_manager())
 

docker-compose.yml

@@ -21,6 +21,10 @@ services:
       - NODE_LONG=${NODE_LONG}
       - MQTT_BROKER=${MQTT_BROKER}
       - ICECAST_SERVER=${ICECAST_SERVER}
+      - AUDIO_BUCKET=${AUDIO_BUCKET}
+      - HTTP_SERVER_PROTOCOL=${HTTP_SERVER_PROTOCOL}
+      - HTTP_SERVER_ADDRESS=${HTTP_SERVER_ADDRESS}
+      - HTTP_SERVER_PORT=${HTTP_SERVER_PORT}
     networks:
       - radio-shared-net