Logan
d201d8124e
docker-compose.yml: Added a pulse_socket named volume mounted at /run/pulse in both op25 and edge-node. Also set PULSE_SERVER=unix:/run/pulse/native in edge-node so libpulse (and ffmpeg's pulse input) finds the right socket.
discord_radio.py: Removed _icecast_url and changed _play_stream() to use -f pulse -i default.monitor. This reads directly from the PulseAudio sink monitor — zero buffer delay. The PULSE_SERVER env var is inherited by the ffmpeg subprocess.
Note: default.monitor captures whatever audio is playing on the default sink. If OP25 uses a named virtual sink, you may need to replace default.monitor with <sink_name>.monitor (run pactl list sinks short inside the op25 container to find the name).
Issue 2 — No audio URL / GCS credentials
storage.py: storage.Client() was using ADC but ADC isn't configured in the container. Now uses storage.Client.from_service_account_json(settings.gcp_credentials_path) when GCP_CREDENTIALS_PATH is set — same credential file Firebase already loads.
You also need to mount the key file into the server container in docker-compose.yml:
c2-core:
volumes:
- ./gcp-key.json:/app/gcp-key.json:ro
And set GCS_BUCKET=your-bucket-name in .env.
Issue 3 — Token orphaning
mqtt_manager.py: Every checkin now includes "discord_connected": radio_bot.is_connected.
mqtt_handler.py: On checkin, if discord_connected is explicitly False, calls release_token(node_id). Only fires on explicit false (missing field = unknown = no action).
node_sweeper.py: When a node is swept to offline, its token is released too. This covers the case where the node stops checking in entirely (crash/power loss).
42 lines
907 B
YAML
42 lines
907 B
YAML
services:
|
|
icecast:
|
|
build: ./icecast
|
|
restart: unless-stopped
|
|
network_mode: host
|
|
environment:
|
|
ICECAST_SOURCE_PASSWORD: ${ICECAST_SOURCE_PASSWORD:-hackme}
|
|
ICECAST_ADMIN_PASSWORD: ${ICECAST_ADMIN_PASSWORD:-admin}
|
|
|
|
op25:
|
|
build: ./op25-container
|
|
restart: unless-stopped
|
|
privileged: true
|
|
network_mode: host
|
|
env_file: .env
|
|
volumes:
|
|
- ./configs:/configs
|
|
- /dev:/dev
|
|
- ./op25-container/app:/app
|
|
- pulse_socket:/run/pulse
|
|
depends_on:
|
|
- icecast
|
|
|
|
edge-node:
|
|
build: ./drb-edge-node
|
|
restart: unless-stopped
|
|
network_mode: host
|
|
env_file: .env
|
|
volumes:
|
|
- ./configs:/configs
|
|
- ./recordings:/recordings
|
|
- ./drb-edge-node/app:/app/app
|
|
- pulse_socket:/run/pulse
|
|
environment:
|
|
PULSE_SERVER: unix:/run/pulse/native
|
|
depends_on:
|
|
- icecast
|
|
- op25
|
|
|
|
volumes:
|
|
pulse_socket:
|