Nail/lang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v53: сервер ждёт закрытия от клиента — close frame не обгоняет text frame

Browse Source
This commit is contained in:
“Naeel”
2026-05-22 17:29:10 +04:00
parent 628fea51b7
commit f4957437db
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.html
+14 -17
View File
@@ -53,7 +53,7 @@ let mediaRecorder, audioChunks = [], userAudioBlob = null, ttsText = '';
let isRecording = false, isAnalyzing = false, micAnalyser = null, micAnimId = null; let isRecording = false, isAnalyzing = false, micAnalyser = null, micAnimId = null;
let recordStartTime = 0, recordDuration = 0; let recordStartTime = 0, recordDuration = 0;
// ---------- Версия ---------- // ---------- Версия ----------
const VERSION = 'v52'; const VERSION = 'v53';
document.getElementById('ver').textContent = VERSION; document.getElementById('ver').textContent = VERSION;
// ---------- Перевод на русский (Groq) ---------- // ---------- Перевод на русский (Groq) ----------
@@ -635,46 +635,43 @@ async function transcribe(blob) {
return new Promise((resolve) => { return new Promise((resolve) => {
let settled = false; let settled = false;
const done = (r) => { if (settled) return; settled = true; try { ws.close(); } catch(e){} resolve(r); }; const done = (r) => { if (settled) return; settled = true; resolve(r); };
const payload = JSON.stringify({ token: GROQ_API_KEY, audio_b64: base64, mime: blob.type || 'audio/webm' }); const payload = JSON.stringify({ token: GROQ_API_KEY, audio_b64: base64, mime: blob.type || 'audio/webm' });
const ws = new WebSocket('wss://proxy.kube5s.ru/ws'); const ws = new WebSocket('wss://proxy.kube5s.ru/ws');
const timeout = setTimeout(() => { console.log('[WS] timeout'); done({ text: '', error: 'timeout' }); }, 60000); const timeout = setTimeout(() => { console.log('[WS] timeout'); try { ws.close(); } catch(e){} done({ text: '', error: 'timeout' }); }, 15000);
// Полинг readyState — onopen может не сработать если WS открылся до присвоения
const trySend = () => { const trySend = () => {
if (settled) return; if (settled) return;
const st = ws.readyState; const st = ws.readyState;
if (st === WebSocket.OPEN) { if (st === WebSocket.OPEN) {
try { ws.send(payload); console.log('[WS] sent'); } catch(e) { console.log('[WS] send err:', e); done({ text: '', error: 'network' }); } try { ws.send(payload); console.log('[WS] sent'); } catch(e) { console.log('[WS] send err:', e); clearTimeout(timeout); done({ text: '', error: 'network' }); }
return; return;
} }
if (st === WebSocket.CONNECTING) { setTimeout(trySend, 20); return; } if (st === WebSocket.CONNECTING) { setTimeout(trySend, 20); return; }
// CLOSING or CLOSED
console.log('[WS] aborted, state=' + st); console.log('[WS] aborted, state=' + st);
clearTimeout(timeout); clearTimeout(timeout);
done({ text: '', error: 'network' }); done({ text: '', error: 'network' });
}; };
ws.onopen = trySend; ws.onopen = trySend;
// Если WS уже открыт — onopen не вызовется, trySend сам отработает
trySend(); trySend();
ws.onmessage = (e) => { ws.onmessage = (e) => {
clearTimeout(timeout); clearTimeout(timeout);
const data = JSON.parse(e.data); try { ws.close(); } catch(ex) {}
console.log('[WS] ← ' + ((performance.now()-tStart)/1000).toFixed(2) + 's → ' + (data.text||'(empty)')); try {
done(data.error ? { text: '', error: data.error } : { text: data.text || '', error: null }); const data = JSON.parse(e.data);
console.log('[WS] ← ' + ((performance.now()-tStart)/1000).toFixed(2) + 's → ' + (data.text||'(empty)'));
done(data.error ? { text: '', error: data.error } : { text: data.text || '', error: null });
} catch(ex) {
console.log('[WS] parse err:', ex);
done({ text: '', error: 'parse' });
}
}; };
ws.onerror = () => { console.log('[WS] error'); clearTimeout(timeout); done({ text: '', error: 'network' }); }; ws.onerror = () => { console.log('[WS] error'); clearTimeout(timeout); done({ text: '', error: 'network' }); };
ws.onclose = (e) => { ws.onclose = (e) => { console.log('[WS] close code=' + e.code); /* не резолвим — клиент сам закрывает после onmessage */ };
console.log('[WS] close code=' + e.code);
// close может прийти раньше onmessage — даём фору 500ms
setTimeout(() => {
if (!settled) { clearTimeout(timeout); done({ text: '', error: 'network' }); }
}, 500);
};
}); });
} }