feat: WebSocket команды — раздельная громкость mic/snd + запись аудио + обновлённый web-client

- satellite.py: разделён _runtime_volume на _runtime_mic_volume и _runtime_snd_volume
- satellite.py: добавлены команды start_recording/stop_recording (WAV через base64)
- satellite.py: метод _create_wav_from_buffer() для создания WAV из буфера
- web-client: добавлен слайдер громкости микрофона (MIC+/MIC-)
- web-client: добавлены кнопки записи и воспроизведения аудио
- web-client: улучшенный лог событий и отладочные console.log
- docs: websocket-server-plan.md сокращён с 1205 до ~80 строк

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
2026-05-25 17:58:37 +03:00
co-authored by Qwen-Coder
parent 61294485ad
commit 2b4e6f824b
7 changed files with 2017 additions and 1209 deletions
+355 -77
View File
@@ -335,14 +335,51 @@
</div>
<div class="flex-between" style="width:100%; margin-top: 8px;">
<span>🔊 VOLUME</span>
<span>🔊 SPEAKER</span>
<span id="volumeValue" style="color:#0ff">0.80</span>
</div>
<input type="range" id="volumeSlider" min="0" max="1" step="0.01" value="0.8" class="volume-slider">
<div class="flex-between" style="width:100%; margin-top: 12px;">
<span>🎤 MICROPHONE</span>
<span id="micVolumeValue" style="color:#0ff">1.00</span>
</div>
<input type="range" id="micVolumeSlider" min="0" max="2" step="0.01" value="1.0" class="volume-slider">
<div class="command-group" style="justify-content: center;">
<button id="muteBtn" class="neo-btn">🔇 MUTE</button>
<button id="unmuteBtn" class="neo-btn">🎤 UNMUTE</button>
</div>
<!-- Audio Recording Controls -->
<div style="margin-top: 20px; padding-top: 15px; border-top: 1px solid rgba(0,255,255,0.2);">
<div class="flex-between" style="margin-bottom: 10px;">
<span style="color: #aaa; font-size: 12px;">🎙️ AUDIO RECORDING</span>
<span id="recordingStatus" style="color:#ff4d4d; font-family: monospace; font-size: 12px;">⏹️ STOPPED</span>
</div>
<div class="command-group" style="justify-content: center;">
<button id="startRecordingBtn" class="neo-btn">🔴 START REC</button>
<button id="stopRecordingBtn" class="neo-btn danger-btn" disabled>⏹️ STOP REC</button>
</div>
<div id="recordingInfo" style="margin-top: 10px; color: #aaa; font-size: 11px; text-align: center; display: none;">
<span id="recordingDuration">0.0s</span> • <span id="recordingSize">0 KB</span>
</div>
<!-- Audio Player -->
<div id="audioPlayerContainer" style="margin-top: 15px; display: none;">
<div style="background: rgba(0,0,0,0.3); border-radius: 12px; padding: 12px;">
<div class="flex-between" style="margin-bottom: 8px;">
<span style="color: #0ff; font-size: 11px;">🎵 ПОСЛЕДНЯЯ ЗАПИСЬ</span>
<span id="lastRecordingName" style="color: #aaa; font-size: 10px;">—</span>
</div>
<audio id="audioPlayer" controls style="width: 100%; height: 32px; border-radius: 8px;"></audio>
<div class="command-group" style="justify-content: center; margin-top: 8px; margin-bottom: 0;">
<button id="downloadRecordingBtn" class="neo-btn" style="font-size: 0.7rem; padding: 6px 12px;">💾 DOWNLOAD</button>
<button id="deleteRecordingBtn" class="neo-btn danger-btn" style="font-size: 0.7rem; padding: 6px 12px;">🗑️ DELETE</button>
</div>
</div>
</div>
</div>
</div>
<!-- ЦЕНТР: команды и транскрипция -->
@@ -356,9 +393,10 @@
<button id="stopTimerBtn" class="neo-btn">⏲️ STOP TIMER</button>
</div>
<div class="command-group">
<button id="volUpBtn" class="neo-btn">➕ VOL+</button>
<button id="volDownBtn" class="neo-btn">➖ VOL-</button>
<button id="requestRmsBtn" class="neo-btn">📊 REQUEST RMS</button>
<button id="volUpBtn" class="neo-btn">🔊 VOL+</button>
<button id="volDownBtn" class="neo-btn">🔉 VOL-</button>
<button id="micUpBtn" class="neo-btn">🎤 MIC+</button>
<button id="micDownBtn" class="neo-btn">🎙️ MIC-</button>
</div>
<div class="command-group">
<button id="singlePressBtn" class="neo-btn">🔘 SINGLE</button>
@@ -409,6 +447,7 @@
let source = null;
let mediaStream = null;
let rmsTimeout = null;
let currentRms = 0.0; // ✅ Текущий RMS уровень от satellite
const canvas = document.getElementById('audioCanvas');
const ctx = canvas.getContext('2d');
@@ -492,14 +531,76 @@
addEventToLog(`📤 cmd: ${command}`);
}
// Recording state
let isRecording = false;
let recordingStartTime = null;
let lastRecordingBlob = null;
let lastRecordingUrl = null;
let lastRecordingFilename = null;
// Обработчик входящих событий от satellite
function handleIncomingMessage(ev) {
try {
const json = JSON.parse(ev.data);
const eventType = json.type || json.event;
// Recording events
if(eventType === 'recording-ready') {
if(json.data) {
const duration = json.data.duration || 0;
const size = json.data.size || 0;
const base64Data = json.data.data;
addEventToLog(`🎙️ Запись готова: ${duration.toFixed(1)}s, ${(size/1024).toFixed(1)} KB`);
// Декодировать base64 и создать blob
try {
const audioData = atob(base64Data);
const bytes = new Uint8Array(audioData.length);
for (let i = 0; i < audioData.length; i++) {
bytes[i] = audioData.charCodeAt(i);
}
const blob = new Blob([bytes], { type: 'audio/wav' });
// Сохранить для плеера
if(lastRecordingUrl) {
URL.revokeObjectURL(lastRecordingUrl);
}
lastRecordingBlob = blob;
lastRecordingUrl = URL.createObjectURL(blob);
lastRecordingFilename = `recording_${new Date().toISOString().replace(/[:.]/g, '-')}.wav`;
// Показать плеер
const audioPlayer = document.getElementById('audioPlayer');
const audioPlayerContainer = document.getElementById('audioPlayerContainer');
const lastRecordingName = document.getElementById('lastRecordingName');
console.log('🎵 Showing audio player:', {
audioPlayer: !!audioPlayer,
audioPlayerContainer: !!audioPlayerContainer,
lastRecordingName: !!lastRecordingName,
url: lastRecordingUrl
});
if(audioPlayer && audioPlayerContainer && lastRecordingName) {
audioPlayer.src = lastRecordingUrl;
audioPlayerContainer.style.display = 'block';
lastRecordingName.innerText = lastRecordingFilename;
addEventToLog(`🎵 Запись готова к прослушиванию`);
console.log('✅ Audio player shown successfully');
} else {
console.error('❌ Audio player elements not found!');
addEventToLog(`❌ Плеер не найден на странице`);
}
} catch(e) {
console.error('❌ Recording decode error:', e);
addEventToLog(`❌ Ошибка декодирования записи: ${e.message}`);
}
}
}
// Audio level events
if(eventType === 'audio-level') {
else if(eventType === 'audio-level') {
if(json.data && json.data.level !== undefined) {
const level = json.data.level;
currentRms = level; // ✅ Обновляем currentRms для визуализации
@@ -727,94 +828,271 @@
}
}
// Кнопки подключения
document.getElementById('connectBtn').addEventListener('click', toggleConnection);
document.getElementById('connectBtnCard').addEventListener('click', toggleConnection);
// Auto-connect при загрузке
// ✅ ЕДИНЫЙ ОБРАБОТЧИК ЗАГРУЗКИ DOM
window.addEventListener('load', () => {
console.log('🚀 DOM loaded, initializing...');
addEventToLog('🤖 Wyoming Droid Assistant • готов к подключению');
// Инициализация RMS элементов после загрузки DOM
// Инициализация RMS элементов
const rmsFillEl = document.getElementById('rmsFill');
const rmsValueEl = document.getElementById('rmsValue');
if (rmsFillEl && rmsValueEl) {
console.log('RMS meter initialized');
console.log('✅ RMS meter initialized');
}
// ✅ РЕГИСТРАЦИЯ ВСЕХ КНОПОК
console.log('🔘 Registering button handlers...');
// Кнопки подключения
const connectBtn = document.getElementById('connectBtn');
const connectBtnCard = document.getElementById('connectBtnCard');
if (connectBtn) connectBtn.addEventListener('click', toggleConnection);
if (connectBtnCard) connectBtnCard.addEventListener('click', toggleConnection);
// Volume control buttons
const startListeningBtn = document.getElementById('startListeningBtn');
const stopPipelineBtn = document.getElementById('stopPipelineBtn');
const stopTimerBtn = document.getElementById('stopTimerBtn');
const muteBtn = document.getElementById('muteBtn');
const unmuteBtn = document.getElementById('unmuteBtn');
const volUpBtn = document.getElementById('volUpBtn');
const volDownBtn = document.getElementById('volDownBtn');
const requestRmsBtn = document.getElementById('requestRmsBtn');
const clearEventsBtn = document.getElementById('clearEvents');
if (startListeningBtn) startListeningBtn.addEventListener('click', () => sendCommand('set_volume', { level: 1.0 }));
if (stopPipelineBtn) stopPipelineBtn.addEventListener('click', () => sendCommand('mute', {}));
if (stopTimerBtn) stopTimerBtn.addEventListener('click', () => sendCommand('unmute', {}));
if (muteBtn) muteBtn.addEventListener('click', () => sendCommand('mute', {}));
if (unmuteBtn) unmuteBtn.addEventListener('click', () => sendCommand('unmute', {}));
if (volUpBtn) volUpBtn.addEventListener('click', () => {
const newVol = Math.min(1.0, currentVolume + 0.1);
currentVolume = newVol;
sendCommand('set_volume', { level: newVol });
volumeSlider.value = newVol;
volumeValueSpan.innerText = newVol.toFixed(2);
});
if (volDownBtn) volDownBtn.addEventListener('click', () => {
const newVol = Math.max(0.0, currentVolume - 0.1);
currentVolume = newVol;
sendCommand('set_volume', { level: newVol });
volumeSlider.value = newVol;
volumeValueSpan.innerText = newVol.toFixed(2);
});
if (requestRmsBtn) requestRmsBtn.addEventListener('click', () => {
sendCommand('trigger_event', { event_type: 'request_audio_level', data: {} });
addEventToLog('📊 Запрошено обновление RMS');
});
// Gesture buttons
const singlePressBtn = document.getElementById('singlePressBtn');
const doublePressBtn = document.getElementById('doublePressBtn');
const triplePressBtn = document.getElementById('triplePressBtn');
const longPressBtn = document.getElementById('longPressBtn');
if (singlePressBtn) singlePressBtn.addEventListener('click', () => sendCommand('trigger_event', { event_type: 'single_press', data: {} }));
if (doublePressBtn) doublePressBtn.addEventListener('click', () => sendCommand('trigger_event', { event_type: 'double_press', data: {} }));
if (triplePressBtn) triplePressBtn.addEventListener('click', () => sendCommand('trigger_event', { event_type: 'triple_press', data: {} }));
if (longPressBtn) longPressBtn.addEventListener('click', () => sendCommand('trigger_event', { event_type: 'long_press', data: {} }));
if (clearEventsBtn) clearEventsBtn.addEventListener('click', () => {
while(eventFeedDiv.children.length > 1) eventFeedDiv.removeChild(eventFeedDiv.lastChild);
addEventToLog('🧹 Лог очищен');
});
// ✅ РЕГИСТРАЦИЯ СЛАЙДЕРОВ
const slider = document.getElementById('volumeSlider');
if (slider) {
console.log('✅ Volume slider found, attaching event listener');
slider.addEventListener('input', (e) => {
const val = parseFloat(e.target.value);
console.log('🎚️ Speaker slider changed:', val);
currentVolume = val;
volumeValueSpan.innerText = val.toFixed(2);
liveVolSpan.innerText = Math.round(val * 100) + '%';
console.log('📤 Sending set_volume command:', val);
sendCommand('set_volume', { level: val });
});
console.log('✅ Speaker slider event listener attached successfully');
} else {
console.error('❌ Volume slider NOT FOUND!');
}
// ✅ РЕГИСТРАЦИЯ СЛАЙДЕРА МИКРОФОНА
let currentMicVolume = 1.0;
const micSlider = document.getElementById('micVolumeSlider');
const micVolumeValueSpan = document.getElementById('micVolumeValue');
if (micSlider && micVolumeValueSpan) {
console.log('✅ Microphone slider found, attaching event listener');
micSlider.addEventListener('input', (e) => {
const val = parseFloat(e.target.value);
console.log('🎤 Mic slider changed:', val);
currentMicVolume = val;
micVolumeValueSpan.innerText = val.toFixed(2);
console.log('📤 Sending set_mic_volume command:', val);
sendCommand('set_mic_volume', { level: val });
});
console.log('✅ Microphone slider event listener attached successfully');
} else {
console.error('❌ Microphone slider NOT FOUND!');
}
// ✅ КНОПКИ MIC+ / MIC-
const micUpBtn = document.getElementById('micUpBtn');
const micDownBtn = document.getElementById('micDownBtn');
if (micUpBtn) {
micUpBtn.addEventListener('click', () => {
const newVol = Math.min(2.0, currentMicVolume + 0.1);
currentMicVolume = newVol;
sendCommand('set_mic_volume', { level: newVol });
micSlider.value = newVol;
micVolumeValueSpan.innerText = newVol.toFixed(2);
addEventToLog(`🎤 Чувствительность микрофона: ${Math.round(newVol * 100)}%`);
});
console.log('✅ MIC+ button registered');
}
if (micDownBtn) {
micDownBtn.addEventListener('click', () => {
const newVol = Math.max(0.0, currentMicVolume - 0.1);
currentMicVolume = newVol;
sendCommand('set_mic_volume', { level: newVol });
micSlider.value = newVol;
micVolumeValueSpan.innerText = newVol.toFixed(2);
addEventToLog(`🎤 Чувствительность микрофона: ${Math.round(newVol * 100)}%`);
});
console.log('✅ MIC- button registered');
}
// ✅ КНОПКИ ЗАПИСИ
const startRecordingBtn = document.getElementById('startRecordingBtn');
const stopRecordingBtn = document.getElementById('stopRecordingBtn');
const recordingStatus = document.getElementById('recordingStatus');
const recordingInfo = document.getElementById('recordingInfo');
const recordingDuration = document.getElementById('recordingDuration');
const recordingSize = document.getElementById('recordingSize');
if (startRecordingBtn && stopRecordingBtn) {
startRecordingBtn.addEventListener('click', () => {
if(!isConnected) {
addEventToLog('❌ Нет подключения к satellite');
return;
}
sendCommand('start_recording', {});
isRecording = true;
recordingStartTime = Date.now();
// Обновить UI
startRecordingBtn.disabled = true;
stopRecordingBtn.disabled = false;
recordingStatus.innerText = '🔴 RECORDING';
recordingStatus.style.color = '#ff4d4d';
recordingInfo.style.display = 'block';
// Обновлять длительность каждую секунду
const updateDuration = setInterval(() => {
if(!isRecording) {
clearInterval(updateDuration);
return;
}
const elapsed = (Date.now() - recordingStartTime) / 1000;
recordingDuration.innerText = elapsed.toFixed(1) + 's';
}, 100);
addEventToLog('🔴 Запись началась');
});
stopRecordingBtn.addEventListener('click', () => {
if(!isRecording) return;
sendCommand('stop_recording', {});
isRecording = false;
// Обновить UI
startRecordingBtn.disabled = false;
stopRecordingBtn.disabled = true;
recordingStatus.innerText = '⏹️ STOPPED';
recordingStatus.style.color = '#aaa';
addEventToLog('⏹️ Запись остановлена, ожидание файла...');
});
console.log('✅ Recording buttons registered');
}
// ✅ КНОПКИ ПЛЕЕРА
const downloadRecordingBtn = document.getElementById('downloadRecordingBtn');
const deleteRecordingBtn = document.getElementById('deleteRecordingBtn');
const audioPlayerContainer = document.getElementById('audioPlayerContainer');
const audioPlayer = document.getElementById('audioPlayer');
if (downloadRecordingBtn) {
downloadRecordingBtn.addEventListener('click', () => {
if(!lastRecordingBlob || !lastRecordingFilename) {
addEventToLog('❌ Нет записи для скачивания');
return;
}
const url = URL.createObjectURL(lastRecordingBlob);
const a = document.createElement('a');
a.href = url;
a.download = lastRecordingFilename;
document.body.appendChild(a);
a.click();
document.body.removeChild(a);
URL.revokeObjectURL(url);
addEventToLog(`💾 Файл скачан: ${lastRecordingFilename}`);
});
console.log('✅ Download recording button registered');
}
if (deleteRecordingBtn && audioPlayerContainer && audioPlayer) {
deleteRecordingBtn.addEventListener('click', () => {
if(!lastRecordingBlob) {
addEventToLog('❌ Нет записи для удаления');
return;
}
// Остановить воспроизведение
audioPlayer.pause();
audioPlayer.src = '';
// Очистить данные
if(lastRecordingUrl) {
URL.revokeObjectURL(lastRecordingUrl);
}
lastRecordingBlob = null;
lastRecordingUrl = null;
lastRecordingFilename = null;
// Скрыть плеер
audioPlayerContainer.style.display = 'none';
addEventToLog('🗑️ Запись удалена');
});
console.log('✅ Delete recording button registered');
}
console.log('✅ All handlers registered');
// Auto-connect если включена опция
const autoConnect = document.getElementById('autoConnect');
if(autoConnect && autoConnect.checked) {
setTimeout(() => {
console.log('🔌 Auto-connecting...');
addEventToLog('📡 Auto-connect...');
toggleConnection();
}, 500);
}
});
// Volume control
document.getElementById('startListeningBtn').addEventListener('click', () => sendCommand('set_volume', { level: 1.0 }));
document.getElementById('stopPipelineBtn').addEventListener('click', () => sendCommand('mute', {}));
document.getElementById('stopTimerBtn').addEventListener('click', () => sendCommand('unmute', {}));
document.getElementById('muteBtn').addEventListener('click', () => sendCommand('mute', {}));
document.getElementById('unmuteBtn').addEventListener('click', () => sendCommand('unmute', {}));
document.getElementById('volUpBtn').addEventListener('click', () => {
const newVol = Math.min(1.0, currentVolume + 0.1);
currentVolume = newVol; // ✅ Обновляем currentVolume
sendCommand('set_volume', { level: newVol });
volumeSlider.value = newVol;
volumeValueSpan.innerText = newVol.toFixed(2);
});
document.getElementById('volDownBtn').addEventListener('click', () => {
const newVol = Math.max(0.0, currentVolume - 0.1);
currentVolume = newVol; // ✅ Обновляем currentVolume
sendCommand('set_volume', { level: newVol });
volumeSlider.value = newVol;
volumeValueSpan.innerText = newVol.toFixed(2);
});
// Request RMS button
document.getElementById('requestRmsBtn').addEventListener('click', () => {
// Запросить обновление audio-level (сателит отправляет их автоматически)
// Отправляем dummy команду для триггера
sendCommand('trigger_event', { event_type: 'request_audio_level', data: {} });
addEventToLog('📊 Запрошено обновление RMS');
});
document.getElementById('pauseMediaBtn').addEventListener('click', () => sendCommand('play_sound', { path: '/home/sirmrak/projects/satellite-dev/sounds/awake.wav' }));
document.getElementById('resumeMediaBtn').addEventListener('click', () => sendCommand('play_sound', { path: '/home/sirmrak/projects/satellite-dev/sounds/done.wav' }));
document.getElementById('stopMediaBtn').addEventListener('click', () => sendCommand('trigger_event', { event_type: 'stop', data: {} }));
document.getElementById('singlePressBtn').addEventListener('click', () => sendCommand('trigger_event', { event_type: 'single_press', data: {} }));
document.getElementById('doublePressBtn').addEventListener('click', () => sendCommand('trigger_event', { event_type: 'double_press', data: {} }));
document.getElementById('triplePressBtn').addEventListener('click', () => sendCommand('trigger_event', { event_type: 'triple_press', data: {} }));
document.getElementById('longPressBtn').addEventListener('click', () => sendCommand('trigger_event', { event_type: 'long_press', data: {} }));
document.getElementById('clearEvents').addEventListener('click', () => {
while(eventFeedDiv.children.length > 1) eventFeedDiv.removeChild(eventFeedDiv.lastChild);
addEventToLog('🧹 Лог очищен');
});
volumeSlider.addEventListener('input', (e) => {
const val = parseFloat(e.target.value);
volumeValueSpan.innerText = val.toFixed(2);
currentVolume = val;
sendCommand('set_volume', { level: val });
});
// автоподключение при загрузке (опционально)
window.addEventListener('load', () => {
addEventToLog('🤖 Интерфейс LVA NEXUS • готов к подключению');
// Инициализация RMS элементов после загрузки DOM
const rmsFillEl = document.getElementById('rmsFill');
const rmsValueEl = document.getElementById('rmsValue');
if (rmsFillEl && rmsValueEl) {
console.log('RMS meter initialized');
}
});
</script>
</body>
</html>
</html>