fix(app): STT-Endpoint großzügiger + Mikro vor Re-Arm freigeben
#2 Vorzeitiges Absenden: endpointMs war hart 1500ms — im Auto (Sprechpausen) schnitt das mitten im Satz ab (die 11.8s-Frage wurde bei "…ohne dass ein" gekappt). Jetzt konfigurierbar (aria_stt_endpoint_ms, Default 2400, 1000-4000). #3 Ohr bleibt ausgegraut: beim Re-Arm rief der Wake-Word-Service OpenWakeWord.start(), waehrend die passive Streaming-Aufnahme noch das Mikro hielt → start() schlug fehl → state=off. Neuer micReleaseHook cancelt die Aufnahme VOR start() (endConversation / exitPassiveListening / discardIfFreshlyTriggered). ChatScreen registriert den Hook. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -49,7 +49,7 @@ import VoiceButton from '../components/VoiceButton';
|
|||||||
import FileUpload, { FileData } from '../components/FileUpload';
|
import FileUpload, { FileData } from '../components/FileUpload';
|
||||||
import CameraUpload, { PhotoData } from '../components/CameraUpload';
|
import CameraUpload, { PhotoData } from '../components/CameraUpload';
|
||||||
import MessageText from '../components/MessageText';
|
import MessageText from '../components/MessageText';
|
||||||
import { loadConvWindowMs, loadTtsSpeed, TTS_SPEED_DEFAULT } from '../services/audio';
|
import { loadConvWindowMs, loadTtsSpeed, TTS_SPEED_DEFAULT, loadSttEndpointMs } from '../services/audio';
|
||||||
import Geolocation from '@react-native-community/geolocation';
|
import Geolocation from '@react-native-community/geolocation';
|
||||||
|
|
||||||
// --- Typen ---
|
// --- Typen ---
|
||||||
@@ -562,6 +562,14 @@ const ChatScreen: React.FC = () => {
|
|||||||
// Wake Word: einmalig laden + Porcupine vorbereiten (wenn Access Key gesetzt)
|
// Wake Word: einmalig laden + Porcupine vorbereiten (wenn Access Key gesetzt)
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
wakeWordService.loadFromStorage().catch(() => {});
|
wakeWordService.loadFromStorage().catch(() => {});
|
||||||
|
// Mikro-Release-Hook: vor jedem Re-Arm eine laufende (passive) Streaming-
|
||||||
|
// Aufnahme canceln, sonst haelt sie das Mikro und OpenWakeWord.start()
|
||||||
|
// schlaegt fehl → Ohr bleibt ausgegraut (state=off).
|
||||||
|
wakeWordService.setMicReleaseHook(async () => {
|
||||||
|
if (audioService.isStreamingRecording()) {
|
||||||
|
await audioService.cancelStreamingRecording('rearm-mic-free');
|
||||||
|
}
|
||||||
|
});
|
||||||
const unsub = wakeWordService.onStateChange((s) => {
|
const unsub = wakeWordService.onStateChange((s) => {
|
||||||
setWakeWordState(s);
|
setWakeWordState(s);
|
||||||
setWakeWordActive(s !== 'off');
|
setWakeWordActive(s !== 'off');
|
||||||
@@ -1465,7 +1473,7 @@ const ChatScreen: React.FC = () => {
|
|||||||
interrupted: wasInterrupted,
|
interrupted: wasInterrupted,
|
||||||
location: location || null,
|
location: location || null,
|
||||||
noSpeechTimeoutMs: windowMs,
|
noSpeechTimeoutMs: windowMs,
|
||||||
endpointMs: 1500,
|
endpointMs: await loadSttEndpointMs(),
|
||||||
hardCapMs: 60000,
|
hardCapMs: 60000,
|
||||||
projectId: focusedProjectIdRef.current,
|
projectId: focusedProjectIdRef.current,
|
||||||
});
|
});
|
||||||
@@ -1561,7 +1569,7 @@ const ChatScreen: React.FC = () => {
|
|||||||
interrupted: true, // Barge-In → Brain weiss "User hat unterbrochen"
|
interrupted: true, // Barge-In → Brain weiss "User hat unterbrochen"
|
||||||
location: location || null,
|
location: location || null,
|
||||||
noSpeechTimeoutMs: windowMs,
|
noSpeechTimeoutMs: windowMs,
|
||||||
endpointMs: 1500,
|
endpointMs: await loadSttEndpointMs(),
|
||||||
hardCapMs: 60000,
|
hardCapMs: 60000,
|
||||||
projectId: focusedProjectIdRef.current,
|
projectId: focusedProjectIdRef.current,
|
||||||
});
|
});
|
||||||
@@ -1618,7 +1626,7 @@ const ChatScreen: React.FC = () => {
|
|||||||
interrupted: false,
|
interrupted: false,
|
||||||
location: location || null,
|
location: location || null,
|
||||||
noSpeechTimeoutMs: Math.min(passiveMs, 30000),
|
noSpeechTimeoutMs: Math.min(passiveMs, 30000),
|
||||||
endpointMs: 1500,
|
endpointMs: await loadSttEndpointMs(),
|
||||||
hardCapMs: Math.max(passiveMs + 5000, 35000),
|
hardCapMs: Math.max(passiveMs + 5000, 35000),
|
||||||
projectId: focusedProjectIdRef.current,
|
projectId: focusedProjectIdRef.current,
|
||||||
});
|
});
|
||||||
@@ -2028,7 +2036,7 @@ const ChatScreen: React.FC = () => {
|
|||||||
// Stoppen). Hard-Cap 5 Minuten als Notbremse — danach killt Whisper
|
// Stoppen). Hard-Cap 5 Minuten als Notbremse — danach killt Whisper
|
||||||
// die Session auch app-seitig haben wir +2s Toleranz.
|
// die Session auch app-seitig haben wir +2s Toleranz.
|
||||||
noSpeechTimeoutMs: 0,
|
noSpeechTimeoutMs: 0,
|
||||||
endpointMs: 1500,
|
endpointMs: await loadSttEndpointMs(),
|
||||||
hardCapMs: 300000,
|
hardCapMs: 300000,
|
||||||
projectId: focusedProjectIdRef.current,
|
projectId: focusedProjectIdRef.current,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -151,6 +151,26 @@ export const CONV_WINDOW_MIN_SEC = 3.0;
|
|||||||
export const CONV_WINDOW_MAX_SEC = 20.0;
|
export const CONV_WINDOW_MAX_SEC = 20.0;
|
||||||
export const CONV_WINDOW_STORAGE_KEY = 'aria_conv_window_sec';
|
export const CONV_WINDOW_STORAGE_KEY = 'aria_conv_window_sec';
|
||||||
|
|
||||||
|
// STT-Endpoint (ms Stille bis "fertig gesprochen"). Zu kurz = schneidet mitten
|
||||||
|
// im Satz ab, besonders im Auto wo man mit Pausen spricht (Reproduktion: die
|
||||||
|
// 11.8s-Frage wurde bei "…ohne dass ein" gekappt). 1500 war zu aggressiv;
|
||||||
|
// 2400 default, im Auto ggf. hoeher. Konfigurierbar in den Settings.
|
||||||
|
export const STT_ENDPOINT_DEFAULT_MS = 2400;
|
||||||
|
export const STT_ENDPOINT_MIN_MS = 1000;
|
||||||
|
export const STT_ENDPOINT_MAX_MS = 4000;
|
||||||
|
export const STT_ENDPOINT_STORAGE_KEY = 'aria_stt_endpoint_ms';
|
||||||
|
|
||||||
|
export async function loadSttEndpointMs(): Promise<number> {
|
||||||
|
try {
|
||||||
|
const raw = await AsyncStorage.getItem(STT_ENDPOINT_STORAGE_KEY);
|
||||||
|
if (raw != null) {
|
||||||
|
const n = parseInt(raw, 10);
|
||||||
|
if (isFinite(n) && n >= STT_ENDPOINT_MIN_MS && n <= STT_ENDPOINT_MAX_MS) return n;
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
|
return STT_ENDPOINT_DEFAULT_MS;
|
||||||
|
}
|
||||||
|
|
||||||
// TTS-Wiedergabegeschwindigkeit — wird pro Geraet gespeichert und an die
|
// TTS-Wiedergabegeschwindigkeit — wird pro Geraet gespeichert und an die
|
||||||
// Bridge mitgegeben (speed-Param im F5-TTS infer()). 1.0 = normal.
|
// Bridge mitgegeben (speed-Param im F5-TTS infer()). 1.0 = normal.
|
||||||
export const TTS_SPEED_DEFAULT = 1.0;
|
export const TTS_SPEED_DEFAULT = 1.0;
|
||||||
|
|||||||
@@ -132,6 +132,12 @@ class WakeWordService {
|
|||||||
* hier eine streaming-Aufnahme OHNE User-Bubble (passiv lauschen). */
|
* hier eine streaming-Aufnahme OHNE User-Bubble (passiv lauschen). */
|
||||||
private passiveListenCallbacks: PassiveListenCallback[] = [];
|
private passiveListenCallbacks: PassiveListenCallback[] = [];
|
||||||
|
|
||||||
|
/** Hook, der das Mikro freigibt (laufende Streaming-Aufnahme canceln) BEVOR
|
||||||
|
* wir OpenWakeWord.start() rufen. Ohne das haelt die passive/conversing
|
||||||
|
* Aufnahme das Mikro noch, start() schlaegt fehl → Ohr bleibt ausgegraut
|
||||||
|
* (state=off). ChatScreen registriert den Hook mit audioService.cancel…. */
|
||||||
|
private micReleaseHook: (() => Promise<void>) | null = null;
|
||||||
|
|
||||||
private keyword: WakeKeyword = DEFAULT_KEYWORD;
|
private keyword: WakeKeyword = DEFAULT_KEYWORD;
|
||||||
private nativeReady: boolean = false;
|
private nativeReady: boolean = false;
|
||||||
private initInProgress: Promise<boolean> | null = null;
|
private initInProgress: Promise<boolean> | null = null;
|
||||||
@@ -149,6 +155,19 @@ class WakeWordService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** ChatScreen registriert hier einen Hook, der eine laufende Streaming-
|
||||||
|
* Aufnahme cancelt (Mikro freigeben) — wird vor jedem Re-Arm gerufen. */
|
||||||
|
setMicReleaseHook(fn: (() => Promise<void>) | null): void {
|
||||||
|
this.micReleaseHook = fn;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async _freeMic(): Promise<void> {
|
||||||
|
if (!this.micReleaseHook) return;
|
||||||
|
try { await this.micReleaseHook(); } catch (e) {
|
||||||
|
console.warn('[WakeWord] micReleaseHook err:', e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/** Settings-Wechsel: anderes Wake-Word. Re-Init des Native-Moduls. */
|
/** Settings-Wechsel: anderes Wake-Word. Re-Init des Native-Moduls. */
|
||||||
async configure(keyword: string): Promise<boolean> {
|
async configure(keyword: string): Promise<boolean> {
|
||||||
const next: WakeKeyword = (WAKE_KEYWORDS as readonly string[]).includes(keyword)
|
const next: WakeKeyword = (WAKE_KEYWORDS as readonly string[]).includes(keyword)
|
||||||
@@ -454,6 +473,7 @@ class WakeWordService {
|
|||||||
// als state extra zu fragen, garantiert dass nach diesem Pfad
|
// als state extra zu fragen, garantiert dass nach diesem Pfad
|
||||||
// Native auch wirklich an ist falls es out-of-band gestoppt wurde.
|
// Native auch wirklich an ist falls es out-of-band gestoppt wurde.
|
||||||
try {
|
try {
|
||||||
|
await this._freeMic(); // Streaming-Aufnahme canceln → Mikro frei
|
||||||
await OpenWakeWord.start();
|
await OpenWakeWord.start();
|
||||||
console.log('[WakeWord] Konversation zu Ende — zurueck zu armed (wasBarge=%s)', wasBarge);
|
console.log('[WakeWord] Konversation zu Ende — zurueck zu armed (wasBarge=%s)', wasBarge);
|
||||||
import('./logger').then(m => m.reportAppDebug('wake.end',
|
import('./logger').then(m => m.reportAppDebug('wake.end',
|
||||||
@@ -520,6 +540,7 @@ class WakeWordService {
|
|||||||
// timeout oder manual → Wake-Word reaktivieren, armed-State.
|
// timeout oder manual → Wake-Word reaktivieren, armed-State.
|
||||||
if (this.nativeReady && OpenWakeWord) {
|
if (this.nativeReady && OpenWakeWord) {
|
||||||
try {
|
try {
|
||||||
|
await this._freeMic(); // passive Streaming-Aufnahme canceln → Mikro frei
|
||||||
await OpenWakeWord.start();
|
await OpenWakeWord.start();
|
||||||
console.log('[WakeWord] zurueck zu armed nach passive-listen');
|
console.log('[WakeWord] zurueck zu armed nach passive-listen');
|
||||||
ToastAndroid.show(`Lausche wieder auf "${KEYWORD_LABELS[this.keyword]}"`, ToastAndroid.SHORT);
|
ToastAndroid.show(`Lausche wieder auf "${KEYWORD_LABELS[this.keyword]}"`, ToastAndroid.SHORT);
|
||||||
@@ -564,6 +585,7 @@ class WakeWordService {
|
|||||||
this.lastTriggerAt = 0;
|
this.lastTriggerAt = 0;
|
||||||
if (this.nativeReady && OpenWakeWord) {
|
if (this.nativeReady && OpenWakeWord) {
|
||||||
try {
|
try {
|
||||||
|
await this._freeMic(); // ggf. laufende Aufnahme canceln → Mikro frei
|
||||||
await OpenWakeWord.start();
|
await OpenWakeWord.start();
|
||||||
ToastAndroid.show('Hintergrund-Trigger verworfen — lausche wieder', ToastAndroid.SHORT);
|
ToastAndroid.show('Hintergrund-Trigger verworfen — lausche wieder', ToastAndroid.SHORT);
|
||||||
this.setState('armed');
|
this.setState('armed');
|
||||||
|
|||||||
Reference in New Issue
Block a user