š Searching YouTube...
';
-
- try {
- const response = await fetch(`/search_youtube?q=${encodeURIComponent(query)}`);
- const data = await response.json();
-
- if (!data.success) {
- resultsDiv.innerHTML = `ā ${data.error}
`;
- return;
- }
-
- displayYouTubeResults(data.results);
- } catch (error) {
- console.error('YouTube search error:', error);
- resultsDiv.innerHTML = 'ā Search failed. Check console.
';
- }
-}
-
-function displayYouTubeResults(results) {
- const resultsDiv = document.getElementById('youtube-results');
-
- if (results.length === 0) {
- resultsDiv.innerHTML = 'No results found
';
- return;
- }
-
- resultsDiv.innerHTML = '';
-
- results.forEach(result => {
- const resultCard = document.createElement('div');
- resultCard.className = 'youtube-result-card';
-
- resultCard.innerHTML = `
-
-
-
- `;
-
- resultsDiv.appendChild(resultCard);
- });
-}
-
-async function downloadYouTubeResult(url, title) {
- const resultsDiv = document.getElementById('youtube-results');
- const originalContent = resultsDiv.innerHTML;
-
- resultsDiv.innerHTML = '${result.title}
- ${result.channel}
- ā³ Downloading...
';
-
- try {
- const response = await fetch('/download', {
- method: 'POST',
- headers: { 'Content-Type': 'application/json' },
- body: JSON.stringify({ url: url, quality: '320' })
- });
-
- const result = await response.json();
-
- if (result.success) {
- resultsDiv.innerHTML = 'ā
Downloaded! Refreshing library...
';
- await fetchLibrary();
- setTimeout(() => {
- resultsDiv.innerHTML = originalContent;
- }, 2000);
- } else {
- resultsDiv.innerHTML = `ā Download failed: ${result.error}
`;
- setTimeout(() => {
- resultsDiv.innerHTML = originalContent;
- }, 3000);
- }
- } catch (error) {
- console.error('Download error:', error);
- resultsDiv.innerHTML = 'ā Download failed
';
- setTimeout(() => {
- resultsDiv.innerHTML = originalContent;
- }, 3000);
- }
-}
async function loadFromServer(id, url, title) {
const d = document.getElementById('display-' + id);
@@ -1382,33 +1281,6 @@ async function loadFromServer(id, url, title) {
}
}
-// Download Functionality
-async function downloadFromPanel(deckId) {
- const input = document.getElementById('search-input-' + deckId);
- const statusDiv = document.getElementById('download-status-' + deckId);
- const qualitySelect = document.getElementById('quality-' + deckId);
- const url = input.value.trim();
- if (!url) return;
-
- statusDiv.innerHTML = 'Downloading...
';
- try {
- const res = await fetch('/download', {
- method: 'POST',
- headers: { 'Content-Type': 'application/json' },
- body: JSON.stringify({ url: url, quality: qualitySelect.value })
- });
- const result = await res.json();
- if (result.success) {
- statusDiv.innerHTML = 'ā
Complete!';
- fetchLibrary();
- setTimeout(() => statusDiv.innerHTML = '', 3000);
- } else {
- statusDiv.innerHTML = 'ā Failed';
- }
- } catch (e) {
- statusDiv.innerHTML = 'ā Error';
- }
-}
// Settings
function toggleSettings() {
@@ -1645,6 +1517,9 @@ function initSocket() {
console.log('ā
Connected to streaming server');
console.log(` Socket ID: ${socket.id}`);
console.log(` Transport: ${socket.io.engine.transport.name}`);
+
+ // Get initial listener count soon as we connect
+ socket.emit('get_listener_count');
});
socket.on('connect_error', (error) => {
@@ -1807,7 +1682,8 @@ function startBroadcast() {
document.getElementById('broadcast-status').classList.add('live');
if (!socket) initSocket();
- socket.emit('start_broadcast');
+ const bitrateValue = document.getElementById('stream-quality').value + 'k';
+ socket.emit('start_broadcast', { bitrate: bitrateValue });
socket.emit('get_listener_count');
console.log('ā
Server-side broadcast started');
@@ -2010,7 +1886,8 @@ function startBroadcast() {
// Notify server that broadcast is active (listeners use MP3 stream)
if (!socket) initSocket();
- socket.emit('start_broadcast');
+ const bitrateValue = document.getElementById('stream-quality').value + 'k';
+ socket.emit('start_broadcast', { bitrate: bitrateValue });
socket.emit('get_listener_count');
console.log('ā
Broadcasting started successfully!');
@@ -2170,37 +2047,38 @@ function toggleAutoStream(enabled) {
function startRemoteRelay() {
const urlInput = document.getElementById('remote-stream-url');
const url = urlInput.value.trim();
-
+
if (!url) {
alert('Please enter a remote stream URL');
return;
}
-
+
if (!socket) initSocket();
-
+
// Stop any existing broadcast first
if (isBroadcasting) {
stopBroadcast();
}
-
+
console.log('š Starting remote relay for:', url);
-
+
// Update UI
document.getElementById('start-relay-btn').style.display = 'none';
document.getElementById('stop-relay-btn').style.display = 'inline-block';
document.getElementById('relay-status').textContent = 'Connecting to remote stream...';
document.getElementById('relay-status').style.color = '#00f3ff';
-
- socket.emit('start_remote_relay', { url: url });
+
+ const bitrateValue = document.getElementById('stream-quality').value + 'k';
+ socket.emit('start_remote_relay', { url: url, bitrate: bitrateValue });
}
function stopRemoteRelay() {
if (!socket) return;
-
+
console.log('š Stopping remote relay');
-
+
socket.emit('stop_remote_relay');
-
+
// Update UI
document.getElementById('start-relay-btn').style.display = 'inline-block';
document.getElementById('stop-relay-btn').style.display = 'none';
diff --git a/server.py b/server.py
index bb1c009..abd2a8a 100644
--- a/server.py
+++ b/server.py
@@ -8,12 +8,13 @@ import subprocess
import threading
import queue
import time
+import collections
from flask import Flask, send_from_directory, jsonify, request, session, Response, stream_with_context
from flask_socketio import SocketIO, emit
from dotenv import load_dotenv
# Load environment variables from .env file
load_dotenv()
-import downloader
+
def _load_config():
@@ -46,7 +47,8 @@ dj_sids = set()
# This allows listeners on browsers that don't support WebM/Opus via MediaSource
# (notably some Safari / locked-down environments) to still hear the stream.
_ffmpeg_proc = None
-_ffmpeg_in_q = queue.Queue(maxsize=200)
+_ffmpeg_in_q = queue.Queue(maxsize=40)
+_current_bitrate = "192k"
_mp3_clients = set() # set[queue.Queue]
_mp3_lock = threading.Lock()
_transcode_threads_started = False
@@ -54,6 +56,7 @@ _transcoder_bytes_out = 0
_transcoder_last_error = None
_last_audio_chunk_ts = 0.0
_remote_stream_url = None # For relaying remote streams
+_mp3_preroll = collections.deque(maxlen=60) # Pre-roll (~2.5s at 192k)
def _start_transcoder_if_needed():
@@ -71,7 +74,9 @@ def _start_transcoder_if_needed():
'-i', _remote_stream_url,
'-vn',
'-acodec', 'libmp3lame',
- '-b:a', '192k',
+ '-b:a', _current_bitrate,
+ '-tune', 'zerolatency',
+ '-flush_packets', '1',
'-f', 'mp3',
'pipe:1',
]
@@ -84,7 +89,9 @@ def _start_transcoder_if_needed():
'-i', 'pipe:0',
'-vn',
'-acodec', 'libmp3lame',
- '-b:a', '192k',
+ '-b:a', _current_bitrate,
+ '-tune', 'zerolatency',
+ '-flush_packets', '1',
'-f', 'mp3',
'pipe:1',
]
@@ -135,15 +142,19 @@ def _start_transcoder_if_needed():
return
while True:
try:
- data = proc.stdout.read(4096)
+ data = proc.stdout.read(1024)
except Exception:
_transcoder_last_error = 'stdout read failed'
break
if not data:
break
_transcoder_bytes_out += len(data)
+
+ # Store in pre-roll
with _mp3_lock:
+ _mp3_preroll.append(data)
clients = list(_mp3_clients)
+
for q in clients:
try:
q.put_nowait(data)
@@ -158,7 +169,7 @@ def _start_transcoder_if_needed():
def _stop_transcoder():
- global _ffmpeg_proc
+ global _ffmpeg_proc, _transcode_threads_started
try:
_ffmpeg_in_q.put_nowait(None)
except Exception:
@@ -166,6 +177,12 @@ def _stop_transcoder():
proc = _ffmpeg_proc
_ffmpeg_proc = None
+
+ # Reset thread flag so they can be re-launched if needed
+ # (The existing threads will exit cleanly on None/EOF)
+ _transcode_threads_started = False
+ _mp3_preroll.clear()
+
if proc is None:
return
try:
@@ -203,67 +220,6 @@ def setup_shared_routes(app):
})
return jsonify(library)
- @app.route('/download', methods=['POST'])
- def download():
- data = request.get_json(silent=True) or {}
- url = data.get('url')
- quality = data.get('quality', '320')
- if not url:
- return jsonify({"success": False, "error": "No URL provided"}), 400
- result = downloader.download_mp3(url, quality)
- return jsonify(result)
-
- @app.route('/search_youtube', methods=['GET'])
- def search_youtube():
- query = request.args.get('q', '')
- if not query:
- return jsonify({"success": False, "error": "No query provided"}), 400
-
- # Get API key from environment variable
- api_key = os.environ.get('YOUTUBE_API_KEY', '')
- if not api_key:
- return jsonify({
- "success": False,
- "error": "YouTube API key not configured. Set YOUTUBE_API_KEY environment variable."
- }), 500
-
- try:
- import requests
- # Search YouTube using Data API v3
- url = 'https://www.googleapis.com/youtube/v3/search'
- params = {
- 'part': 'snippet',
- 'q': query,
- 'type': 'video',
- 'videoCategoryId': '10', # Music category
- 'maxResults': 20,
- 'key': api_key
- }
-
- response = requests.get(url, params=params)
- data = response.json()
-
- if 'error' in data:
- return jsonify({
- "success": False,
- "error": data['error'].get('message', 'YouTube API error')
- }), 400
-
- # Format results
- results = []
- for item in data.get('items', []):
- results.append({
- 'videoId': item['id']['videoId'],
- 'title': item['snippet']['title'],
- 'channel': item['snippet']['channelTitle'],
- 'thumbnail': item['snippet']['thumbnails']['medium']['url'],
- 'url': f"https://www.youtube.com/watch?v={item['id']['videoId']}"
- })
-
- return jsonify({"success": True, "results": results})
-
- except Exception as e:
- return jsonify({"success": False, "error": str(e)}), 500
@app.route('/