diff --git a/src/hooks/useAchievements.ts b/src/hooks/useAchievements.ts index 6259f8b..9ae6c28 100644 --- a/src/hooks/useAchievements.ts +++ b/src/hooks/useAchievements.ts @@ -17,29 +17,31 @@ export const useAchievements = () => { setAchievementQueue(prev => [...prev, ach]); }, []); - const processQueue = useCallback(() => { - setAchievementQueue(prev => { - if (prev.length === 0) return prev; - const [next, ...rest] = prev; - setActiveAchievement(next); - - if (achievementTimeoutRef.current) clearTimeout(achievementTimeoutRef.current); - achievementTimeoutRef.current = setTimeout(() => { - if (isMountedRef.current) { - setActiveAchievement(null); - setAchievementQueue(rest); - } - }, 3000); - - return rest; - }); - }, []); - + // 🔧 ФИКС (24.09.2026): achievements_queue_overwrite_loses_new_items + + // achievements_reset_does_not_clear_timeout — + // 1) раньше в таймауте очередь перезаписывалась захваченным `rest`, + // поэтому если во время показа приходило новое — оно терялось. + // 2) resetAchievements не чистил таймаут, и через 3 сек очередь «воскресала». + // Теперь: active ставится из очереди, таймаут только снимает active — + // очередь обновляется функционально, ничего не теряется. useEffect(() => { - if (activeAchievement === null && achievementQueue.length > 0) { - processQueue(); - } - }, [activeAchievement, achievementQueue, processQueue]); + if (activeAchievement !== null) return; + if (achievementQueue.length === 0) return; + + // Берём первый из очереди как active + const next = achievementQueue[0]; + setActiveAchievement(next); + // Убираем его из очереди + setAchievementQueue(prev => prev.filter(a => a.id !== next.id || a.icon !== next.icon || a.name !== next.name)); + + // Таймаут: через 3 сек снимаем active + if (achievementTimeoutRef.current) clearTimeout(achievementTimeoutRef.current); + achievementTimeoutRef.current = setTimeout(() => { + if (isMountedRef.current) { + setActiveAchievement(null); + } + }, 3000); + }, [activeAchievement, achievementQueue]); useEffect(() => { isMountedRef.current = true; @@ -49,7 +51,12 @@ export const useAchievements = () => { }; }, []); + // 🔧 ФИКС (24.09.2026): resetAchievements теперь чистит таймаут. const resetAchievements = useCallback(() => { + if (achievementTimeoutRef.current) { + clearTimeout(achievementTimeoutRef.current); + achievementTimeoutRef.current = null; + } setAchievementQueue([]); setActiveAchievement(null); }, []); diff --git a/src/pages/FlashcardsPage.tsx b/src/pages/FlashcardsPage.tsx index c7df163..2f4a81b 100644 --- a/src/pages/FlashcardsPage.tsx +++ b/src/pages/FlashcardsPage.tsx @@ -30,6 +30,8 @@ const FlashcardsPage: React.FC = () => { const { activeAchievement, showAchievement } = useAchievements(); const isMountedRef = useRef(true); const audioRef = useRef(null); + // 🔧 ФИКС (24.09.2026): URL_LEAK_FLASHCARDS — храним URL для revoke. + const audioUrlRef = useRef(null); const brandColor = '#2ECC71'; const textColor = '#1A1A2E'; @@ -82,6 +84,12 @@ const FlashcardsPage: React.FC = () => { audioRef.current = null; } + // 🔧 ФИКС (24.09.2026): URL_LEAK_FLASHCARDS — освобождаем предыдущий URL + if (audioUrlRef.current) { + try { URL.revokeObjectURL(audioUrlRef.current); } catch { /* ignore */ } + audioUrlRef.current = null; + } + if ('speechSynthesis' in window) { window.speechSynthesis.cancel(); } @@ -91,15 +99,26 @@ const FlashcardsPage: React.FC = () => { try { const audioBlob = await getTTS(word, 'male'); const audioUrl = URL.createObjectURL(audioBlob); + audioUrlRef.current = audioUrl; // 🔧 сохраняем для revoke const audio = new Audio(audioUrl); audioRef.current = audio; audio.onended = () => { if (isMountedRef.current) setIsPlayingLetter(false); + // 🔧 ФИКС (24.09.2026): освобождаем URL после воспроизведения + if (audioUrlRef.current === audioUrl) { + try { URL.revokeObjectURL(audioUrl); } catch { /* ignore */ } + audioUrlRef.current = null; + } }; audio.onerror = () => { + // 🔧 Освобождаем URL перед fallback + if (audioUrlRef.current === audioUrl) { + try { URL.revokeObjectURL(audioUrl); } catch { /* ignore */ } + audioUrlRef.current = null; + } playWebSpeech(word); }; @@ -153,6 +172,11 @@ const FlashcardsPage: React.FC = () => { audioRef.current.pause(); audioRef.current = null; } + // 🔧 ФИКС (24.09.2026): URL_LEAK_FLASHCARDS — освобождаем URL при unmount + if (audioUrlRef.current) { + try { URL.revokeObjectURL(audioUrlRef.current); } catch { /* ignore */ } + audioUrlRef.current = null; + } if ('speechSynthesis' in window) { window.speechSynthesis.cancel(); } diff --git a/src/pages/PronunciationPage.tsx b/src/pages/PronunciationPage.tsx index ff2362c..3c62d64 100644 --- a/src/pages/PronunciationPage.tsx +++ b/src/pages/PronunciationPage.tsx @@ -29,6 +29,8 @@ const PronunciationPage: React.FC = () => { const [isPlaying, setIsPlaying] = useState(false); const [showRules, setShowRules] = useState(false); const audioRef = useRef(null); + // 🔧 ФИКС (24.09.2026): URL_LEAK_PRONUNCIATION — храним URL для revoke. + const audioUrlRef = useRef(null); const isMountedRef = useRef(true); const rulesShownRef = useRef(false); const trackedRef = useRef(false); @@ -57,6 +59,12 @@ const PronunciationPage: React.FC = () => { audioRef.current = null; } + // 🔧 ФИКС (24.09.2026): URL_LEAK_PRONUNCIATION — освобождаем предыдущий URL + if (audioUrlRef.current) { + try { URL.revokeObjectURL(audioUrlRef.current); } catch { /* ignore */ } + audioUrlRef.current = null; + } + // Останавливаем Web Speech API, если он что-то говорит if ('speechSynthesis' in window) { window.speechSynthesis.cancel(); @@ -68,15 +76,26 @@ const PronunciationPage: React.FC = () => { // Пробуем Edge TTS через бэкенд const audioBlob = await getTTS(word, 'male'); const audioUrl = URL.createObjectURL(audioBlob); + audioUrlRef.current = audioUrl; // 🔧 сохраняем для revoke const audio = new Audio(audioUrl); audioRef.current = audio; audio.onended = () => { if (isMountedRef.current) setIsPlaying(false); + // 🔧 ФИКС (24.09.2026): освобождаем URL + if (audioUrlRef.current === audioUrl) { + try { URL.revokeObjectURL(audioUrl); } catch { /* ignore */ } + audioUrlRef.current = null; + } }; audio.onerror = () => { + // 🔧 Освобождаем URL перед fallback + if (audioUrlRef.current === audioUrl) { + try { URL.revokeObjectURL(audioUrl); } catch { /* ignore */ } + audioUrlRef.current = null; + } // Edge TTS не сработал — пробуем Web Speech API playWebSpeech(word); }; @@ -169,6 +188,11 @@ const PronunciationPage: React.FC = () => { audioRef.current.pause(); audioRef.current = null; } + // 🔧 ФИКС (24.09.2026): URL_LEAK_PRONUNCIATION — освобождаем URL при unmount + if (audioUrlRef.current) { + try { URL.revokeObjectURL(audioUrlRef.current); } catch { /* ignore */ } + audioUrlRef.current = null; + } // Останавливаем Web Speech API при уходе со страницы if ('speechSynthesis' in window) { window.speechSynthesis.cancel(); diff --git a/src/pages/TestViewPage.tsx b/src/pages/TestViewPage.tsx index 1ce1c23..5515f76 100644 --- a/src/pages/TestViewPage.tsx +++ b/src/pages/TestViewPage.tsx @@ -51,7 +51,11 @@ const TestViewPage: React.FC = () => { const [examplesError, setExamplesError] = useState(null); const [isPlayingExamples, setIsPlayingExamples] = useState(false); const [isStartingPractice, setIsStartingPractice] = useState(false); + // 🔧 ФИКС (24.09.2026): ALERT_IN_TELEGRAM_MINIAPP — toast вместо alert(). + const [toastMessage, setToastMessage] = useState(null); const audioRef = useRef(null); + // 🔧 ФИКС (24.09.2026): URL_LEAK_TESTVIEW — храним URL для revoke. + const audioUrlRef = useRef(null); const brandColor = '#A970D6'; const textColor = '#1A1A2E'; @@ -68,6 +72,12 @@ const TestViewPage: React.FC = () => { ...extra, }); + // 🔧 ФИКС (24.09.2026): ALERT_IN_TELEGRAM_MINIAPP — helper для toast. + const showToast = (msg: string) => { + setToastMessage(msg); + setTimeout(() => setToastMessage(null), 2500); + }; + useEffect(() => { if (topicId) { setLoading(true); @@ -91,6 +101,23 @@ const TestViewPage: React.FC = () => { } }, [topicId]); + // 🔧 ФИКС (24.09.2026): URL_LEAK_TESTVIEW — cleanup при unmount. + useEffect(() => { + return () => { + if (audioRef.current) { + audioRef.current.pause(); + audioRef.current = null; + } + if (audioUrlRef.current) { + try { URL.revokeObjectURL(audioUrlRef.current); } catch { /* ignore */ } + audioUrlRef.current = null; + } + if ('speechSynthesis' in window) { + window.speechSynthesis.cancel(); + } + }; + }, []); + // 🔧 ФИКС (23.09.2026): TESTVIEW_SAVEANSWER_MISSING_PARAMS — сигнатура // приведена к общему виду (isFinalAnswer, usedHint) — как в LessonViewPage // и PracticeViewPage. Раньше тест не передавал usedHint, и статистика @@ -219,6 +246,11 @@ const TestViewPage: React.FC = () => { audioRef.current.pause(); audioRef.current = null; } + // 🔧 ФИКС (24.09.2026): URL_LEAK_TESTVIEW — освобождаем предыдущий URL + if (audioUrlRef.current) { + try { URL.revokeObjectURL(audioUrlRef.current); } catch { /* ignore */ } + audioUrlRef.current = null; + } if ('speechSynthesis' in window) { window.speechSynthesis.cancel(); } @@ -228,10 +260,24 @@ const TestViewPage: React.FC = () => { try { const audioBlob = await getTTS(polishText, 'male'); const audioUrl = URL.createObjectURL(audioBlob); + audioUrlRef.current = audioUrl; // 🔧 сохраняем для revoke const audio = new Audio(audioUrl); audioRef.current = audio; - audio.onended = () => setIsPlayingExamples(false); - audio.onerror = () => setIsPlayingExamples(false); + audio.onended = () => { + setIsPlayingExamples(false); + // 🔧 ФИКС (24.09.2026): освобождаем URL + if (audioUrlRef.current === audioUrl) { + try { URL.revokeObjectURL(audioUrl); } catch { /* ignore */ } + audioUrlRef.current = null; + } + }; + audio.onerror = () => { + setIsPlayingExamples(false); + if (audioUrlRef.current === audioUrl) { + try { URL.revokeObjectURL(audioUrl); } catch { /* ignore */ } + audioUrlRef.current = null; + } + }; await audio.play(); } catch (e) { console.error('TTS error:', e); @@ -248,8 +294,8 @@ const TestViewPage: React.FC = () => { // Проверяем, есть ли слабые темы const analytics = await getLearningAnalytics(); if (!analytics.has_practice_available) { - // Нет слабых тем — показываем сообщение - alert(t('testPracticeNoWeak')); + // 🔧 ФИКС (24.09.2026): ALERT_IN_TELEGRAM_MINIAPP — toast вместо alert() + showToast(t('testPracticeNoWeak')); setIsStartingPractice(false); return; } @@ -264,12 +310,14 @@ const TestViewPage: React.FC = () => { }, }); } else { - alert(data.message || t('testPracticeNoWeak')); + // 🔧 ФИКС (24.09.2026): toast вместо alert() + showToast(data.message || t('testPracticeNoWeak')); setIsStartingPractice(false); } } catch (e) { console.error('Error starting practice:', e); - alert(t('teacherAIError')); + // 🔧 ФИКС (24.09.2026): toast вместо alert() + showToast(t('teacherAIError')); setIsStartingPractice(false); } }; @@ -309,6 +357,28 @@ const TestViewPage: React.FC = () => { justifyContent: 'center', padding: '24px', }}> + {/* 🔧 ФИКС (24.09.2026): ALERT_IN_TELEGRAM_MINIAPP — toast вместо alert() */} + {toastMessage && ( +
+ {toastMessage} +
+ )} +
{percentage >= 70 ? '🎉' : percentage >= 50 ? '👍' : '💪'}
diff --git a/src/pages/TypingPage.tsx b/src/pages/TypingPage.tsx index 5fe8c4c..aaf30d6 100644 --- a/src/pages/TypingPage.tsx +++ b/src/pages/TypingPage.tsx @@ -24,6 +24,8 @@ const TypingPage: React.FC = () => { const [totalSentences, setTotalSentences] = useState(0); const [isPlaying, setIsPlaying] = useState(false); const audioRef = useRef(null); + // 🔧 ФИКС (24.09.2026): URL_LEAK_TYPING — храним URL для revoke. + const audioUrlRef = useRef(null); const brandColor = '#2ECC71'; const textColor = '#1A1A2E'; @@ -52,6 +54,11 @@ const TypingPage: React.FC = () => { audioRef.current.pause(); audioRef.current = null; } + // 🔧 ФИКС (24.09.2026): URL_LEAK_TYPING — освобождаем URL при новом запросе + if (audioUrlRef.current) { + try { URL.revokeObjectURL(audioUrlRef.current); } catch { /* ignore */ } + audioUrlRef.current = null; + } getNextTypingSentence() .then((data: any) => { @@ -81,6 +88,11 @@ const TypingPage: React.FC = () => { audioRef.current.pause(); audioRef.current = null; } + // 🔧 ФИКС (24.09.2026): URL_LEAK_TYPING — освобождаем URL при unmount + if (audioUrlRef.current) { + try { URL.revokeObjectURL(audioUrlRef.current); } catch { /* ignore */ } + audioUrlRef.current = null; + } if ('speechSynthesis' in window) { window.speechSynthesis.cancel(); } @@ -125,6 +137,12 @@ const TypingPage: React.FC = () => { audioRef.current = null; } + // 🔧 ФИКС (24.09.2026): URL_LEAK_TYPING — освобождаем предыдущий URL + if (audioUrlRef.current) { + try { URL.revokeObjectURL(audioUrlRef.current); } catch { /* ignore */ } + audioUrlRef.current = null; + } + if ('speechSynthesis' in window) { window.speechSynthesis.cancel(); } @@ -134,11 +152,25 @@ const TypingPage: React.FC = () => { try { const audioBlob = await getTTS(correctAnswer, 'male'); const audioUrl = URL.createObjectURL(audioBlob); + audioUrlRef.current = audioUrl; // 🔧 сохраняем для revoke const audio = new Audio(audioUrl); audioRef.current = audio; - audio.onended = () => setIsPlaying(false); - audio.onerror = () => setIsPlaying(false); + audio.onended = () => { + setIsPlaying(false); + // 🔧 ФИКС (24.09.2026): освобождаем URL + if (audioUrlRef.current === audioUrl) { + try { URL.revokeObjectURL(audioUrl); } catch { /* ignore */ } + audioUrlRef.current = null; + } + }; + audio.onerror = () => { + setIsPlaying(false); + if (audioUrlRef.current === audioUrl) { + try { URL.revokeObjectURL(audioUrl); } catch { /* ignore */ } + audioUrlRef.current = null; + } + }; await audio.play(); } catch (e) {