feat(tts): multi-voice switcher for EN & RU, Irina default voice, punctuation pause normalization and speed calibration

This commit is contained in:
Antigravity committed 2026-10-07 12:07:01 +03:00
1 parent 7893b353aa
commit 31e105b2c2
11 files changed
+486 -61

No files matched your search

+115
View File
@@ -2431,6 +2431,121 @@ body.drawer-open {
border-top: 1px solid var(--border-color);
}
/* Voice Settings Modal */
.voice-modal-window {
max-width: 680px;
width: 95%;
}
.voice-modal-body {
padding: 20px 24px;
display: flex;
flex-direction: column;
gap: 16px;
max-height: 80vh;
overflow-y: auto;
}
.modal-desc-sub {
font-size: 13px;
color: var(--text-muted);
margin: 0 0 10px 0;
}
.voice-group-title {
font-size: 14px;
font-weight: 700;
color: var(--text-main);
display: block;
margin-bottom: 10px;
}
.voice-options-grid {
display: grid;
grid-template-columns: repeat(3, 1fr);
gap: 12px;
}
@media (max-width: 680px) {
.voice-options-grid {
grid-template-columns: 1fr;
}
}
.voice-card-label {
cursor: pointer;
display: block;
position: relative;
user-select: none;
}
.voice-card-label input[type="radio"] {
position: absolute;
opacity: 0;
pointer-events: none;
}
.voice-card {
border: 1px solid var(--border-color);
background: var(--bg-card);
border-radius: var(--radius-md);
padding: 14px 14px;
display: flex;
flex-direction: column;
gap: 8px;
height: 100%;
transition: var(--transition);
}
.voice-card:hover {
border-color: var(--primary-dim);
}
.voice-card-label input[type="radio"]:checked + .voice-card {
border-color: var(--primary);
background: var(--bg-main);
box-shadow: 0 0 0 2px var(--primary-dim);
}
.voice-card-head {
display: flex;
justify-content: space-between;
align-items: center;
gap: 6px;
}
.voice-card-desc {
font-size: 12px;
line-height: 1.4;
color: var(--text-muted);
flex: 1;
}
.badge-recommended {
background: rgba(16, 185, 129, 0.15);
color: #10b981;
font-size: 10px;
font-weight: 700;
padding: 2px 6px;
border-radius: 4px;
white-space: nowrap;
}
.badge-uk {
background: rgba(59, 130, 246, 0.15);
color: #3b82f6;
font-size: 10px;
font-weight: 700;
padding: 2px 6px;
border-radius: 4px;
white-space: nowrap;
}
.voice-test-btn {
align-self: flex-start;
margin-top: 4px;
}
/* Summary Card */
.srs-summary-card {
background-color: var(--bg-card);
+102
View File
@@ -512,6 +512,11 @@
<option value="business">💼 Работа & Бизнес</option>
<option value="cards">📚 Мои слова из словаря</option>
</select>
<select id="listening-voice-select" class="select-styled select-xs" title="Голос английского диктора">
<option value="en_US-lessac">👩 Paula (US)</option>
<option value="en_US-ryan">👨 Ryan (US)</option>
<option value="en_GB-alan">👨 Alan (UK)</option>
</select>
<select id="listening-speed-select" class="select-styled select-xs" title="Скорость речи">
<option value="1.0">⚡ 1.0x</option>
<option value="0.75">🐢 0.75x</option>
@@ -1184,6 +1189,12 @@
<span class="drawer-item-label">Переключить тему оформления</span>
</button>
</li>
<li>
<button class="drawer-nav-item" id="drawer-nav-voice-settings">
<span class="drawer-item-icon">🎙️</span>
<span class="drawer-item-label">Голоса озвучки (TTS)</span>
</button>
</li>
<li>
<button class="drawer-nav-item text-danger" id="drawer-nav-logout">
<span class="drawer-item-icon">🚪</span>
@@ -1392,6 +1403,97 @@
</div>
</div>
<!-- Voice Settings Modal -->
<div id="voice-settings-modal" class="modal-backdrop hidden">
<div class="modal-window voice-modal-window">
<div class="modal-header">
<h3>🎙️ Настройка дикторов (TTS)</h3>
<button id="voice-settings-close-btn" class="icon-btn" title="Закрыть">✕</button>
</div>
<div class="modal-body voice-modal-body">
<p class="modal-desc-sub">Выберите голос для озвучки английских и русских текстов. Нейросеть работает полностью автономно.</p>
<div class="voice-config-group">
<label class="voice-group-title">🇷🇺 Русский диктор (перевод и контекст):</label>
<div class="voice-options-grid">
<label class="voice-card-label">
<input type="radio" name="tts_voice_ru" value="ru_RU-irina" checked>
<div class="voice-card">
<div class="voice-card-head">
<strong>👩 Ирина</strong>
<span class="badge-recommended">Рекомендуется</span>
</div>
<small class="voice-card-desc">Плавный студийный голос, естественные паузы на тире и запятых, спокойный темп.</small>
<button type="button" class="btn btn-xs btn-outline voice-test-btn" data-lang="ru" data-voice="ru_RU-irina" data-text="Это важный проект — он требует внимания, концентрации и времени.">▶ Тест звука</button>
</div>
</label>
<label class="voice-card-label">
<input type="radio" name="tts_voice_ru" value="ru_RU-denis">
<div class="voice-card">
<div class="voice-card-head">
<strong>👨 Денис</strong>
</div>
<small class="voice-card-desc">Спокойный мужской тембр, ровная дикция.</small>
<button type="button" class="btn btn-xs btn-outline voice-test-btn" data-lang="ru" data-voice="ru_RU-denis" data-text="Это важный проект — он требует внимания, концентрации и времени.">▶ Тест звука</button>
</div>
</label>
<label class="voice-card-label">
<input type="radio" name="tts_voice_ru" value="ru_RU-dmitri">
<div class="voice-card">
<div class="voice-card-head">
<strong>👨 Дмитрий</strong>
</div>
<small class="voice-card-desc">Энергичный мужской голос с оптимизированным размеренным темпом.</small>
<button type="button" class="btn btn-xs btn-outline voice-test-btn" data-lang="ru" data-voice="ru_RU-dmitri" data-text="Это важный проект — он требует внимания, концентрации и времени.">▶ Тест звука</button>
</div>
</label>
</div>
</div>
<div class="voice-config-group" style="margin-top: 20px;">
<label class="voice-group-title">🇬🇧 / 🇺🇸 Английский диктор (слова, аудирование, книги):</label>
<div class="voice-options-grid">
<label class="voice-card-label">
<input type="radio" name="tts_voice_en" value="en_US-lessac" checked>
<div class="voice-card">
<div class="voice-card-head">
<strong>👩 Paula (US)</strong>
<span class="badge-recommended">По умолчанию</span>
</div>
<small class="voice-card-desc">Американский английский. Четкий академический женский голос.</small>
<button type="button" class="btn btn-xs btn-outline voice-test-btn" data-lang="en" data-voice="en_US-lessac" data-text="The quick brown fox jumps over the lazy dog.">▶ Test Voice</button>
</div>
</label>
<label class="voice-card-label">
<input type="radio" name="tts_voice_en" value="en_US-ryan">
<div class="voice-card">
<div class="voice-card-head">
<strong>👨 Ryan (US)</strong>
</div>
<small class="voice-card-desc">Американский английский. Естественный, выразительный мужской голос.</small>
<button type="button" class="btn btn-xs btn-outline voice-test-btn" data-lang="en" data-voice="en_US-ryan" data-text="The quick brown fox jumps over the lazy dog.">▶ Test Voice</button>
</div>
</label>
<label class="voice-card-label">
<input type="radio" name="tts_voice_en" value="en_GB-alan">
<div class="voice-card">
<div class="voice-card-head">
<strong>👨 Alan (UK)</strong>
<span class="badge-uk">British</span>
</div>
<small class="voice-card-desc">Британский английский (Received Pronunciation), классический мужской тембр.</small>
<button type="button" class="btn btn-xs btn-outline voice-test-btn" data-lang="en" data-voice="en_GB-alan" data-text="Good afternoon! The train to Oxford departs from platform four.">▶ Test Voice</button>
</div>
</label>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" id="voice-settings-save-btn" class="btn btn-primary">Сохранить выбор</button>
</div>
</div>
</div>
<!-- Wikipedia Settings Modal -->
<div id="wiki-settings-modal" class="modal-backdrop hidden">
<div class="modal-window wiki-modal-window">
+69 -1
View File
@@ -4,7 +4,7 @@
// =======================================================================
import { api } from './modules/api.js';
import { initTheme, openModal, closeModal, showToast } from './modules/ui.js';
import { initTheme, openModal, closeModal, showToast, playTextSpeech } from './modules/ui.js';
import { initDictionary, loadInitialData } from './modules/dictionary.js';
import { initSrs, startSrsTrainingSession, openStatsDashboard } from './modules/srs.js';
import { initReader, loadBookshelf, openBook } from './modules/reader.js';
@@ -546,6 +546,14 @@ export function initNavigationDrawer() {
themeToggle.click();
});
}
const drawerNavVoiceSettings = document.getElementById('drawer-nav-voice-settings');
const voiceSettingsModal = document.getElementById('voice-settings-modal');
if (drawerNavVoiceSettings && voiceSettingsModal) {
drawerNavVoiceSettings.addEventListener('click', () => {
closeDrawer();
openVoiceSettingsModal();
});
}
if (drawerNavLogout && logoutBtn) {
drawerNavLogout.addEventListener('click', () => {
closeDrawer();
@@ -554,6 +562,63 @@ export function initNavigationDrawer() {
}
}
// -----------------------------------------------------------------------
// Voice Settings Modal Controller (TTS)
// -----------------------------------------------------------------------
function openVoiceSettingsModal() {
const voiceSettingsModal = document.getElementById('voice-settings-modal');
if (!voiceSettingsModal) return;
const currentRu = localStorage.getItem('notes_tts_voice_ru') || 'ru_RU-irina';
const currentEn = localStorage.getItem('notes_tts_voice_en') || 'en_US-lessac';
const ruInput = voiceSettingsModal.querySelector(`input[name="tts_voice_ru"][value="${currentRu}"]`);
if (ruInput) ruInput.checked = true;
const enInput = voiceSettingsModal.querySelector(`input[name="tts_voice_en"][value="${currentEn}"]`);
if (enInput) enInput.checked = true;
openModal(voiceSettingsModal);
}
function initVoiceSettingsModal() {
const voiceSettingsModal = document.getElementById('voice-settings-modal');
const voiceSettingsCloseBtn = document.getElementById('voice-settings-close-btn');
const voiceSettingsSaveBtn = document.getElementById('voice-settings-save-btn');
if (voiceSettingsCloseBtn && voiceSettingsModal) {
voiceSettingsCloseBtn.addEventListener('click', () => closeModal(voiceSettingsModal));
}
if (voiceSettingsSaveBtn && voiceSettingsModal) {
voiceSettingsSaveBtn.addEventListener('click', () => {
const ruVal = voiceSettingsModal.querySelector('input[name="tts_voice_ru"]:checked')?.value || 'ru_RU-irina';
const enVal = voiceSettingsModal.querySelector('input[name="tts_voice_en"]:checked')?.value || 'en_US-lessac';
localStorage.setItem('notes_tts_voice_ru', ruVal);
localStorage.setItem('notes_tts_voice_en', enVal);
// Sync with listening selector if on screen
const listeningVoiceSelect = document.getElementById('listening-voice-select');
if (listeningVoiceSelect) {
listeningVoiceSelect.value = enVal;
}
closeModal(voiceSettingsModal);
showToast('✅ Голоса дикторов сохранены!', 'success');
});
}
// Voice test buttons
if (voiceSettingsModal) {
voiceSettingsModal.querySelectorAll('.voice-test-btn').forEach(btn => {
btn.addEventListener('click', (e) => {
e.preventDefault();
e.stopPropagation();
const lang = btn.dataset.lang || 'en';
const voice = btn.dataset.voice;
const text = btn.dataset.text || 'Test voice';
playTextSpeech(text, lang, 1.0, voice);
});
});
}
}
// -----------------------------------------------------------------------
// Password Change Modal
// -----------------------------------------------------------------------
@@ -695,6 +760,9 @@ document.addEventListener('DOMContentLoaded', () => {
// 7. Change Password Modal
initChangePasswordModal();
// 7b. Voice Settings Modal (TTS)
initVoiceSettingsModal();
// 8. Hash Change Listener
window.addEventListener('hashchange', handleRouting);
+14 -2
View File
@@ -185,8 +185,12 @@ export const api = {
// Listening Comprehension Trainer
listening: {
async getExercise(topic = 'all', level = 'B1') {
const resp = await fetch(`/api/listening/exercise?topic=${encodeURIComponent(topic)}&level=${encodeURIComponent(level)}`);
async getExercise(topic = 'all', level = 'B1', voice = null) {
let url = `/api/listening/exercise?topic=${encodeURIComponent(topic)}&level=${encodeURIComponent(level)}`;
if (voice) {
url += `&voice=${encodeURIComponent(voice)}`;
}
const resp = await fetch(url);
if (resp.ok) return await resp.json();
throw new Error(`Failed to load listening exercise: ${resp.status}`);
},
@@ -206,6 +210,14 @@ export const api = {
}
},
// Neural Speech Synthesis (TTS)
tts: {
async getStatus() {
const resp = await fetch('/api/tts/status');
return resp.ok ? await resp.json() : null;
}
},
// Bookshelf & Reader
books: {
async getAll() {
+11 -1
View File
@@ -111,6 +111,7 @@ export function initSrs() {
const listeningLevelBadge = document.getElementById('listening-level-badge');
const listeningTopicBadge = document.getElementById('listening-topic-badge');
const listeningTopicSelect = document.getElementById('listening-topic-select');
const listeningVoiceSelect = document.getElementById('listening-voice-select');
const listeningSpeedSelect = document.getElementById('listening-speed-select');
const listeningNewScenarioBtn = document.getElementById('listening-new-scenario-btn');
const listeningTitle = document.getElementById('listening-title');
@@ -715,8 +716,9 @@ export function initSrs() {
if (listeningTitle) listeningTitle.textContent = 'Загрузка аудио-ситуации...';
const topic = listeningTopicSelect ? listeningTopicSelect.value : 'all';
const voice = listeningVoiceSelect ? listeningVoiceSelect.value : (localStorage.getItem('notes_tts_voice_en') || 'en_US-lessac');
try {
const data = await api.listening.getExercise(topic, 'B1');
const data = await api.listening.getExercise(topic, 'B1', voice);
currentListeningExercise = data;
if (listeningTitle) listeningTitle.textContent = data.title || 'Ситуация для аудирования';
@@ -788,6 +790,14 @@ export function initSrs() {
});
}
if (listeningVoiceSelect) {
listeningVoiceSelect.value = localStorage.getItem('notes_tts_voice_en') || 'en_US-lessac';
listeningVoiceSelect.addEventListener('change', () => {
localStorage.setItem('notes_tts_voice_en', listeningVoiceSelect.value);
loadListeningExercise(true);
});
}
if (listeningForm) {
listeningForm.addEventListener('submit', async (e) => {
e.preventDefault();
+8 -2
View File
@@ -194,8 +194,14 @@ export function playAudio(url, speed = 1.0) {
}
}
export function playTextSpeech(text, lang = 'en', speed = 1.0) {
export function playTextSpeech(text, lang = 'en', speed = 1.0, voice = null) {
if (!text || !text.trim()) return null;
const url = `/api/tts?text=${encodeURIComponent(text.trim())}&lang=${lang}&speed=${speed}`;
const isRu = lang && lang.toLowerCase().startsWith('ru');
const savedVoice = isRu ? localStorage.getItem('notes_tts_voice_ru') : localStorage.getItem('notes_tts_voice_en');
const activeVoice = voice || savedVoice;
let url = `/api/tts?text=${encodeURIComponent(text.trim())}&lang=${lang}&speed=${speed}`;
if (activeVoice) {
url += `&voice=${encodeURIComponent(activeVoice)}`;
}
return playAudio(url, speed);
}
+1 -1
View File
@@ -1,7 +1,7 @@
// Service Worker for Notes English PWA (Stage 2)
// Strategy: Cache-first for static assets, Network-first for API calls.
const CACHE_NAME = 'notes-v6.5';
const CACHE_NAME = 'notes-v6.6';
const OFFLINE_URL = '/';
const PRECACHE_URLS = [