Compare commits
53 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7e12816ebd | |||
| 8f64f8fb30 | |||
| b3ff3991c4 | |||
| a4ea387c98 | |||
| 68fbf74a23 | |||
| b857f778e9 | |||
| 31aa82b68c | |||
| de8eeb69e2 | |||
| f5970ce700 | |||
| ef1a4436ca | |||
| 981779cd9e | |||
| 3dcd2ae0b4 | |||
| 2750b867a3 | |||
| f6424add6c | |||
| 2dfd21d1d0 | |||
| 9d9ddc730b | |||
| 77ccee8331 | |||
| 175dcdf225 | |||
| 1549e9cd4f | |||
| 910e74b497 | |||
| 160c5c34b6 | |||
| a6638c0108 | |||
| 43c21d3ddc | |||
| b73c6c346e | |||
| b91ddc5bdf | |||
| 7d08c06720 | |||
| f066a2a555 | |||
| b55b0e7c42 | |||
| 70f806ef80 | |||
| 0773d9496d | |||
| 1a4857ed62 | |||
| 962d814318 | |||
| 9276a92c83 | |||
| d16896c4b4 | |||
| 20050d4077 | |||
| 79760d1b2e | |||
| 13f1103604 | |||
| 73b7a76ea8 | |||
| 17f3d8870e | |||
| 4feaacc7e4 | |||
| af7b2674f3 | |||
| 97442198ec | |||
| e3e841f2ab | |||
| 33185de42b | |||
| dbe547d4ea | |||
| 1a982c0d45 | |||
| dfba5ceb1f | |||
| 1a6f633836 | |||
| 7f7db100af | |||
| d646e9d58e | |||
| bef59ba134 | |||
| dbebfd44ff | |||
| 4d0b9e0d78 |
@@ -384,7 +384,7 @@ API-Endpoint fuer andere Services: `GET http://localhost:3001/api/session`
|
|||||||
- **VAD (Voice Activity Detection)**: Adaptive Schwelle (Baseline aus ersten 500ms Mic-Pegel + 6dB Offset). Konfigurierbare Stille-Toleranz (1.0–8.0s, Default 2.8s) bevor Auto-Stop greift. Max-Aufnahme einstellbar (1–30 min, Default 5 min)
|
- **VAD (Voice Activity Detection)**: Adaptive Schwelle (Baseline aus ersten 500ms Mic-Pegel + 6dB Offset). Konfigurierbare Stille-Toleranz (1.0–8.0s, Default 2.8s) bevor Auto-Stop greift. Max-Aufnahme einstellbar (1–30 min, Default 5 min)
|
||||||
- **Barge-In**: Wenn du waehrend ARIAs Antwort eine neue Sprach-/Text-Nachricht reinschickst, wird sie unterbrochen + bekommt den Hint "das ist eine Korrektur"
|
- **Barge-In**: Wenn du waehrend ARIAs Antwort eine neue Sprach-/Text-Nachricht reinschickst, wird sie unterbrochen + bekommt den Hint "das ist eine Korrektur"
|
||||||
- **Wake-Word waehrend TTS**: Du kannst "Computer" sagen waehrend ARIA noch redet — AcousticEchoCanceler verhindert dass ARIAs eigene Stimme das Wake-Word triggert
|
- **Wake-Word waehrend TTS**: Du kannst "Computer" sagen waehrend ARIA noch redet — AcousticEchoCanceler verhindert dass ARIAs eigene Stimme das Wake-Word triggert
|
||||||
- **Anruf-Pause**: TTS verstummt automatisch wenn das Telefon klingelt (READ_PHONE_STATE Permission)
|
- **Anruf-Pause + Auto-Resume**: TTS verstummt bei klassischem Anruf oder VoIP-Call (WhatsApp/Signal/Discord). Nach dem Auflegen geht ARIA von der **genauen Stelle** weiter wo sie unterbrochen wurde — die App misst die Position vom Wiedergabe-Anfang und nutzt den WAV-Cache der Antwort
|
||||||
- **Speech Gate**: Aufnahme wird verworfen wenn keine Sprache erkannt
|
- **Speech Gate**: Aufnahme wird verworfen wenn keine Sprache erkannt
|
||||||
- **STT (Speech-to-Text)**: 16kHz mono → Bridge → Gamebox-Whisper (CUDA) → Text im Chat. Fast in Echtzeit.
|
- **STT (Speech-to-Text)**: 16kHz mono → Bridge → Gamebox-Whisper (CUDA) → Text im Chat. Fast in Echtzeit.
|
||||||
- **"ARIA denkt..." Indicator**: Zeigt live den Status vom Core (Denken, Tool, Schreiben) + Abbrechen-Button
|
- **"ARIA denkt..." Indicator**: Zeigt live den Status vom Core (Denken, Tool, Schreiben) + Abbrechen-Button
|
||||||
@@ -510,10 +510,36 @@ Der Update-Flow:
|
|||||||
App (Mikrofon) → AAC/MP4 Aufnahme → Base64 → RVS → Bridge
|
App (Mikrofon) → AAC/MP4 Aufnahme → Base64 → RVS → Bridge
|
||||||
Bridge: FFmpeg (16kHz PCM) → Whisper STT → Text → aria-core
|
Bridge: FFmpeg (16kHz PCM) → Whisper STT → Text → aria-core
|
||||||
Bridge: STT-Ergebnis → RVS → App (Placeholder wird durch transkribierten Text ersetzt)
|
Bridge: STT-Ergebnis → RVS → App (Placeholder wird durch transkribierten Text ersetzt)
|
||||||
aria-core → Antwort → Bridge → XTTS (Gaming-PC) → PCM-Stream → RVS → App
|
aria-core → Antwort → Bridge → F5-TTS (Gaming-PC) → PCM-Stream → RVS → App
|
||||||
App: AudioTrack MODE_STREAM (nahtlos), Cache als WAV pro Message
|
App: AudioTrack MODE_STREAM (nahtlos), Cache als WAV pro Message
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Audio-Verhalten in der App
|
||||||
|
|
||||||
|
| Phase | Andere App (Spotify) | ARIA-Mikro |
|
||||||
|
|------------------------------|----------------------|-------------------------|
|
||||||
|
| Idle / Ohr aus | spielt frei | aus |
|
||||||
|
| Wake-Word lauscht (armed) | spielt frei | passiv (openWakeWord) |
|
||||||
|
| User-Aufnahme laeuft | pausiert (EXCLUSIVE) | Recording |
|
||||||
|
| Aufnahme zu Ende | resumed | aus |
|
||||||
|
| ARIA denkt/schreibt (~20s) | spielt frei | aus |
|
||||||
|
| TTS startet | pausiert (DUCK) | aus (oder barge) |
|
||||||
|
| TTS spielt (auch GPU-Pausen) | bleibt pausiert | barge wenn Wake-Word |
|
||||||
|
| TTS zu Ende | nach 800ms resumed | (Conversation-Window) |
|
||||||
|
| Eingehender Anruf (auch VoIP)| — | Mikro pausiert |
|
||||||
|
| Anruf vorbei (Auto-Resume) | pausiert wieder | aus |
|
||||||
|
| Neue Frage waehrend Anruf | — | (Resume verworfen) |
|
||||||
|
|
||||||
|
Mechanismen: Underrun-Schutz im PcmStreamPlayer (Stille-Fill in Render-
|
||||||
|
Pausen), Conversation-Focus bei Wake-Word, Foreground-Service mit
|
||||||
|
mediaPlayback|microphone, Anruf-Erkennung ueber TelephonyManager +
|
||||||
|
AudioFocus-Loss-Listener mit Polling-Fallback (VoIP). Bei Anruf wird
|
||||||
|
die Wiedergabe-Position gemerkt — nach dem Auflegen spielt ARIA ab
|
||||||
|
der genauen Stelle weiter (oder verwirft das wenn der User waehrend
|
||||||
|
des Telefonats per Text eine neue Frage gestellt hat). PcmPlayback-
|
||||||
|
Finished-Event vom Native sorgt dafuer dass Spotify erst pausiert
|
||||||
|
bleibt bis ARIA wirklich verstummt ist.
|
||||||
|
|
||||||
### Datei-Pipeline (Bilder & Anhaenge)
|
### Datei-Pipeline (Bilder & Anhaenge)
|
||||||
|
|
||||||
```
|
```
|
||||||
@@ -844,7 +870,9 @@ docker exec aria-core ssh aria-wohnung hostname
|
|||||||
- [x] Audio-Pause statt Ducking (TRANSIENT statt MAY_DUCK) + release-Timing fix
|
- [x] Audio-Pause statt Ducking (TRANSIENT statt MAY_DUCK) + release-Timing fix
|
||||||
- [x] VAD-Stille-Toleranz einstellbar (1-8s) + adaptive Mikro-Baseline + Max-Aufnahme einstellbar (1-30 min)
|
- [x] VAD-Stille-Toleranz einstellbar (1-8s) + adaptive Mikro-Baseline + Max-Aufnahme einstellbar (1-30 min)
|
||||||
- [x] Barge-In: User kann ARIA waehrend Antwort unterbrechen, aria-core bekommt Kontext-Hint
|
- [x] Barge-In: User kann ARIA waehrend Antwort unterbrechen, aria-core bekommt Kontext-Hint
|
||||||
- [x] Anruf-Pause: TTS verstummt bei eingehendem Anruf (PhoneStateListener)
|
- [x] Anruf-Pause + Auto-Resume: TTS verstummt bei Anruf, faehrt nach Auflegen ab der gemerkten Position fort (Date.now()-Tracking + WAV-Cache der Antwort)
|
||||||
|
- [x] PcmPlaybackFinished-Event: AudioFocus wird erst released wenn AudioTrack wirklich durch ist — kein Spotify-mid-TTS mehr
|
||||||
|
- [x] Edge-Case: neue Frage waehrend Telefonat verwirft pending Auto-Resume, neueste Antwort gewinnt
|
||||||
- [x] Settings-Sub-Screens: 8 Kategorien statt langer Liste
|
- [x] Settings-Sub-Screens: 8 Kategorien statt langer Liste
|
||||||
- [x] APK ABI-Split arm64-v8a: 35 MB statt 136 MB
|
- [x] APK ABI-Split arm64-v8a: 35 MB statt 136 MB
|
||||||
- [x] Sprachnachrichten-Bubble: audioRequestId statt Substring-Match — keine vertauschten Bubbles mehr bei parallelen Aufnahmen
|
- [x] Sprachnachrichten-Bubble: audioRequestId statt Substring-Match — keine vertauschten Bubbles mehr bei parallelen Aufnahmen
|
||||||
|
|||||||
@@ -79,8 +79,8 @@ android {
|
|||||||
applicationId "com.ariacockpit"
|
applicationId "com.ariacockpit"
|
||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
versionCode 802
|
versionCode 10000
|
||||||
versionName "0.0.8.2"
|
versionName "0.1.0.0"
|
||||||
// Fallback fuer Libraries mit Product Flavors
|
// Fallback fuer Libraries mit Product Flavors
|
||||||
missingDimensionStrategy 'react-native-camera', 'general'
|
missingDimensionStrategy 'react-native-camera', 'general'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,9 @@
|
|||||||
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
|
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
|
||||||
<!-- Anruf-State lesen damit TTS bei klingelndem Telefon pausiert -->
|
<!-- Anruf-State lesen damit TTS bei klingelndem Telefon pausiert -->
|
||||||
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
|
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
|
||||||
|
<!-- Optional: GPS-Position der Frage anhaengen (nur wenn User in Settings aktiviert) -->
|
||||||
|
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
|
||||||
|
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
||||||
<!-- Foreground-Service damit TTS auch bei minimierter App weiterlaeuft.
|
<!-- Foreground-Service damit TTS auch bei minimierter App weiterlaeuft.
|
||||||
FOREGROUND_SERVICE_MICROPHONE ist Pflicht ab Android 14 wenn der
|
FOREGROUND_SERVICE_MICROPHONE ist Pflicht ab Android 14 wenn der
|
||||||
Service waehrend des Backgrounds aufs Mikro zugreift (Wake-Word,
|
Service waehrend des Backgrounds aufs Mikro zugreift (Wake-Word,
|
||||||
|
|||||||
@@ -5,26 +5,71 @@ import android.media.AudioAttributes
|
|||||||
import android.media.AudioFocusRequest
|
import android.media.AudioFocusRequest
|
||||||
import android.media.AudioManager
|
import android.media.AudioManager
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
|
import android.util.Log
|
||||||
|
import com.facebook.react.bridge.Arguments
|
||||||
import com.facebook.react.bridge.Promise
|
import com.facebook.react.bridge.Promise
|
||||||
import com.facebook.react.bridge.ReactApplicationContext
|
import com.facebook.react.bridge.ReactApplicationContext
|
||||||
import com.facebook.react.bridge.ReactContextBaseJavaModule
|
import com.facebook.react.bridge.ReactContextBaseJavaModule
|
||||||
import com.facebook.react.bridge.ReactMethod
|
import com.facebook.react.bridge.ReactMethod
|
||||||
|
import com.facebook.react.modules.core.DeviceEventManagerModule
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Steuert Audio-Focus fuer Ducking/Muten anderer Apps.
|
* Steuert Audio-Focus fuer Ducking/Muten anderer Apps + emittiert Loss-Events
|
||||||
|
* an JS damit ARIA bei VoIP-Anrufen (WhatsApp/Signal/Discord/...) aufhoert
|
||||||
|
* zu sprechen — diese Anrufe gehen nicht ueber TelephonyManager, sondern
|
||||||
|
* requestn AudioFocus_GAIN_TRANSIENT_EXCLUSIVE was wir hier mitbekommen.
|
||||||
*
|
*
|
||||||
* - requestDuck() → andere Apps werden leiser (ARIA spricht TTS)
|
* - requestDuck() → andere Apps werden leiser (ARIA spricht TTS)
|
||||||
* - requestExclusive() → andere Apps werden pausiert (Mikrofon-Aufnahme)
|
* - requestExclusive() → andere Apps werden pausiert (Mikrofon-Aufnahme)
|
||||||
* - release() → Focus abgeben, andere Apps duerfen wieder
|
* - release() → Focus abgeben, andere Apps duerfen wieder
|
||||||
|
*
|
||||||
|
* Events:
|
||||||
|
* - "AudioFocusChanged" mit type:
|
||||||
|
* "loss" — endgueltiger Verlust (Anruf, andere App permanent)
|
||||||
|
* "loss_transient" — vorruebergehender Verlust (kurze Unterbrechung)
|
||||||
|
* "gain" — Fokus zurueck
|
||||||
*/
|
*/
|
||||||
class AudioFocusModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
|
class AudioFocusModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
|
||||||
override fun getName() = "AudioFocus"
|
override fun getName() = "AudioFocus"
|
||||||
|
|
||||||
|
companion object { private const val TAG = "AudioFocus" }
|
||||||
|
|
||||||
private var currentRequest: AudioFocusRequest? = null
|
private var currentRequest: AudioFocusRequest? = null
|
||||||
|
|
||||||
private fun audioManager(): AudioManager? =
|
private fun audioManager(): AudioManager? =
|
||||||
reactApplicationContext.getSystemService(Context.AUDIO_SERVICE) as? AudioManager
|
reactApplicationContext.getSystemService(Context.AUDIO_SERVICE) as? AudioManager
|
||||||
|
|
||||||
|
private fun emitFocusChange(type: String) {
|
||||||
|
try {
|
||||||
|
val params = Arguments.createMap().apply { putString("type", type) }
|
||||||
|
reactApplicationContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
|
||||||
|
.emit("AudioFocusChanged", params)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Log.w(TAG, "emit failed: ${e.message}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private val focusListener = AudioManager.OnAudioFocusChangeListener { focusChange ->
|
||||||
|
when (focusChange) {
|
||||||
|
AudioManager.AUDIOFOCUS_LOSS -> {
|
||||||
|
Log.i(TAG, "AUDIOFOCUS_LOSS (z.B. Anruf, anderer Player permanent)")
|
||||||
|
emitFocusChange("loss")
|
||||||
|
}
|
||||||
|
AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> {
|
||||||
|
Log.i(TAG, "AUDIOFOCUS_LOSS_TRANSIENT (kurze Unterbrechung)")
|
||||||
|
emitFocusChange("loss_transient")
|
||||||
|
}
|
||||||
|
AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK -> {
|
||||||
|
// Notification-Sound o.ae. — wir ignorieren das, ARIA macht weiter
|
||||||
|
Log.d(TAG, "AUDIOFOCUS_LOSS_CAN_DUCK ignoriert")
|
||||||
|
}
|
||||||
|
AudioManager.AUDIOFOCUS_GAIN -> {
|
||||||
|
Log.i(TAG, "AUDIOFOCUS_GAIN")
|
||||||
|
emitFocusChange("gain")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private fun requestFocus(durationHint: Int, usage: Int, promise: Promise) {
|
private fun requestFocus(durationHint: Int, usage: Int, promise: Promise) {
|
||||||
val am = audioManager()
|
val am = audioManager()
|
||||||
if (am == null) {
|
if (am == null) {
|
||||||
@@ -41,13 +86,13 @@ class AudioFocusModule(reactContext: ReactApplicationContext) : ReactContextBase
|
|||||||
.build()
|
.build()
|
||||||
val req = AudioFocusRequest.Builder(durationHint)
|
val req = AudioFocusRequest.Builder(durationHint)
|
||||||
.setAudioAttributes(attrs)
|
.setAudioAttributes(attrs)
|
||||||
.setOnAudioFocusChangeListener { /* kein Callback noetig */ }
|
.setOnAudioFocusChangeListener(focusListener)
|
||||||
.build()
|
.build()
|
||||||
currentRequest = req
|
currentRequest = req
|
||||||
am.requestAudioFocus(req)
|
am.requestAudioFocus(req)
|
||||||
} else {
|
} else {
|
||||||
@Suppress("DEPRECATION")
|
@Suppress("DEPRECATION")
|
||||||
am.requestAudioFocus(null, AudioManager.STREAM_MUSIC, durationHint)
|
am.requestAudioFocus(focusListener, AudioManager.STREAM_MUSIC, durationHint)
|
||||||
}
|
}
|
||||||
|
|
||||||
promise.resolve(result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED)
|
promise.resolve(result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED)
|
||||||
@@ -92,8 +137,24 @@ class AudioFocusModule(reactContext: ReactApplicationContext) : ReactContextBase
|
|||||||
currentRequest?.let { am.abandonAudioFocusRequest(it) }
|
currentRequest?.let { am.abandonAudioFocusRequest(it) }
|
||||||
} else {
|
} else {
|
||||||
@Suppress("DEPRECATION")
|
@Suppress("DEPRECATION")
|
||||||
am.abandonAudioFocus(null)
|
am.abandonAudioFocus(focusListener)
|
||||||
}
|
}
|
||||||
currentRequest = null
|
currentRequest = null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Aktueller Audio-Mode: NORMAL=0, IN_CALL=2, IN_COMMUNICATION=3, CALL_SCREENING=4.
|
||||||
|
* IN_COMMUNICATION ist der typische VoIP-Anruf-Mode (WhatsApp, Signal, etc.) —
|
||||||
|
* kann gepollt werden um zu erkennen wann der Anruf vorbei ist (zurueck NORMAL). */
|
||||||
|
@ReactMethod
|
||||||
|
fun getMode(promise: Promise) {
|
||||||
|
val am = audioManager()
|
||||||
|
if (am == null) {
|
||||||
|
promise.resolve(0)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
promise.resolve(am.mode)
|
||||||
|
}
|
||||||
|
|
||||||
|
@ReactMethod fun addListener(eventName: String) {}
|
||||||
|
@ReactMethod fun removeListeners(count: Int) {}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,12 +4,15 @@ import android.media.AudioAttributes
|
|||||||
import android.media.AudioFormat
|
import android.media.AudioFormat
|
||||||
import android.media.AudioManager
|
import android.media.AudioManager
|
||||||
import android.media.AudioTrack
|
import android.media.AudioTrack
|
||||||
|
import android.os.Build
|
||||||
import android.util.Base64
|
import android.util.Base64
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
|
import com.facebook.react.bridge.Arguments
|
||||||
import com.facebook.react.bridge.Promise
|
import com.facebook.react.bridge.Promise
|
||||||
import com.facebook.react.bridge.ReactApplicationContext
|
import com.facebook.react.bridge.ReactApplicationContext
|
||||||
import com.facebook.react.bridge.ReactContextBaseJavaModule
|
import com.facebook.react.bridge.ReactContextBaseJavaModule
|
||||||
import com.facebook.react.bridge.ReactMethod
|
import com.facebook.react.bridge.ReactMethod
|
||||||
|
import com.facebook.react.modules.core.DeviceEventManagerModule
|
||||||
import java.util.concurrent.LinkedBlockingQueue
|
import java.util.concurrent.LinkedBlockingQueue
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -76,9 +79,12 @@ class PcmStreamPlayerModule(reactContext: ReactApplicationContext) : ReactContex
|
|||||||
val encoding = AudioFormat.ENCODING_PCM_16BIT
|
val encoding = AudioFormat.ENCODING_PCM_16BIT
|
||||||
val minBuf = AudioTrack.getMinBufferSize(sampleRate, channelConfig, encoding)
|
val minBuf = AudioTrack.getMinBufferSize(sampleRate, channelConfig, encoding)
|
||||||
val bytesPerSecond = sampleRate * channels * 2 // 16-bit = 2 bytes
|
val bytesPerSecond = sampleRate * channels * 2 // 16-bit = 2 bytes
|
||||||
// Buffer muss mindestens PREROLL + etwas Spielraum fassen.
|
|
||||||
val prerollTarget = (bytesPerSecond * prerollSec).toInt()
|
val prerollTarget = (bytesPerSecond * prerollSec).toInt()
|
||||||
val bufferSize = (minBuf * 32).coerceAtLeast(prerollTarget * 2)
|
// Buffer entkoppelt von Preroll — fester ~4s-Buffer. OnePlus A12
|
||||||
|
// mit USAGE_ASSISTANT laeuft AudioTrack erst ab ~3s gepufferter
|
||||||
|
// Daten an. Wir padden Kurztexte vor play() auf 3s (siehe Block
|
||||||
|
// nach mainLoop), Buffer braucht ~1s Headroom weil write() blockt.
|
||||||
|
val bufferSize = (bytesPerSecond * 4).coerceAtLeast(minBuf * 8)
|
||||||
prerollBytes = prerollTarget
|
prerollBytes = prerollTarget
|
||||||
bytesBuffered = 0
|
bytesBuffered = 0
|
||||||
playbackStarted = false
|
playbackStarted = false
|
||||||
@@ -102,7 +108,20 @@ class PcmStreamPlayerModule(reactContext: ReactApplicationContext) : ReactContex
|
|||||||
.setTransferMode(AudioTrack.MODE_STREAM)
|
.setTransferMode(AudioTrack.MODE_STREAM)
|
||||||
.build()
|
.build()
|
||||||
|
|
||||||
// AudioTrack erstellen — play() wird erst aufgerufen wenn Pre-Roll erreicht.
|
// Start-Threshold runterdrehen: Default ist bufferSize/2 (= 2s bei 4s
|
||||||
|
// Buffer). AudioTrack startet sonst nicht bevor 2s im Puffer sind —
|
||||||
|
// bei kurzen TTS-Antworten (3 Worte ~ 1.4s) bleibt pos auf 0 stehen.
|
||||||
|
// 0.1s reicht damit AudioTrack sofort mit dem ersten Chunk anlaeuft.
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
||||||
|
try {
|
||||||
|
val startFrames = (sampleRate / 10).coerceAtLeast(1) // 100ms
|
||||||
|
newTrack.setStartThresholdInFrames(startFrames)
|
||||||
|
Log.i(TAG, "Start-Threshold gesetzt: ${startFrames} frames (~100ms)")
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Log.w(TAG, "setStartThresholdInFrames failed: ${e.message}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
track = newTrack
|
track = newTrack
|
||||||
queue.clear()
|
queue.clear()
|
||||||
writerShouldStop = false
|
writerShouldStop = false
|
||||||
@@ -137,10 +156,12 @@ class PcmStreamPlayerModule(reactContext: ReactApplicationContext) : ReactContex
|
|||||||
Log.w(TAG, "play() sofort failed: ${e.message}")
|
Log.w(TAG, "play() sofort failed: ${e.message}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Idle-Cutoff: wenn endRequested NICHT kam aber 30s nichts mehr
|
// Idle-Cutoff: wenn endRequested NICHT kam aber lange nichts mehr
|
||||||
// reinkommt, brechen wir ab (Bridge-Crash, verlorener final).
|
// reinkommt, brechen wir ab (Bridge-Crash, verlorener final).
|
||||||
|
// 120s damit lange F5-TTS-Render-Pausen zwischen Saetzen (z.B. bei
|
||||||
|
// Modell-Wechsel oder kalter GPU) nicht den Stream abreissen.
|
||||||
var idleMs = 0L
|
var idleMs = 0L
|
||||||
val maxIdleMs = 30_000L
|
val maxIdleMs = 120_000L
|
||||||
// Zielpufferfuellung — unter diesem Wasserstand fuettern wir
|
// Zielpufferfuellung — unter diesem Wasserstand fuettern wir
|
||||||
// Stille rein damit AudioTrack nicht underrunt waehrend die
|
// Stille rein damit AudioTrack nicht underrunt waehrend die
|
||||||
// Bridge den naechsten Satz rendert. Spotify/YouTube reagieren
|
// Bridge den naechsten Satz rendert. Spotify/YouTube reagieren
|
||||||
@@ -152,15 +173,11 @@ class PcmStreamPlayerModule(reactContext: ReactApplicationContext) : ReactContex
|
|||||||
val data = queue.poll(50, java.util.concurrent.TimeUnit.MILLISECONDS)
|
val data = queue.poll(50, java.util.concurrent.TimeUnit.MILLISECONDS)
|
||||||
if (data == null) {
|
if (data == null) {
|
||||||
if (endRequested) {
|
if (endRequested) {
|
||||||
// Falls wir vor Pre-Roll enden (kurzer Text): trotzdem abspielen
|
// Falls play() noch gar nicht lief (Stream ohne data
|
||||||
|
// ueberhaupt — sehr seltene Edge-Case): jetzt anstossen
|
||||||
|
// damit das finally{}-Wait nicht endlos blockt.
|
||||||
if (!playbackStarted) {
|
if (!playbackStarted) {
|
||||||
try {
|
try { t.play(); playbackStarted = true } catch (_: Exception) {}
|
||||||
t.play()
|
|
||||||
playbackStarted = true
|
|
||||||
Log.i(TAG, "Playback gestartet VOR Pre-Roll (kurzer Text, ${bytesBuffered}B gepuffert)")
|
|
||||||
} catch (e: Exception) {
|
|
||||||
Log.w(TAG, "play() fallback failed: ${e.message}")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
break@mainLoop
|
break@mainLoop
|
||||||
}
|
}
|
||||||
@@ -192,12 +209,16 @@ class PcmStreamPlayerModule(reactContext: ReactApplicationContext) : ReactContex
|
|||||||
}
|
}
|
||||||
idleMs = 0L
|
idleMs = 0L
|
||||||
|
|
||||||
// Pre-Roll Check: play() erst wenn genug gepuffert
|
// play() beim ALLERERSTEN data-chunk aufrufen — egal wie wenig
|
||||||
if (!playbackStarted && bytesBuffered + data.size >= prerollBytes) {
|
// Daten da sind. Sonst stallt AudioTrack auf OnePlus A12 wenn
|
||||||
|
// play() erst gerufen wird nachdem der Buffer komplett gefuellt
|
||||||
|
// ist. Pre-Roll als "Vorrat aufbauen" passiert dann waehrend
|
||||||
|
// der Track schon spielt — Underrun-Schutz fuettert ggf. Stille.
|
||||||
|
if (!playbackStarted) {
|
||||||
try {
|
try {
|
||||||
t.play()
|
t.play()
|
||||||
playbackStarted = true
|
playbackStarted = true
|
||||||
Log.i(TAG, "Playback gestartet nach Pre-Roll ${bytesBuffered + data.size} Bytes")
|
Log.i(TAG, "Playback gestartet beim 1. Chunk (${bytesBuffered}B leading + ${data.size}B data)")
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
Log.w(TAG, "play() failed: ${e.message}")
|
Log.w(TAG, "play() failed: ${e.message}")
|
||||||
}
|
}
|
||||||
@@ -233,12 +254,21 @@ class PcmStreamPlayerModule(reactContext: ReactApplicationContext) : ReactContex
|
|||||||
val totalFrames = (bytesBuffered / streamBytesPerFrame).toInt()
|
val totalFrames = (bytesBuffered / streamBytesPerFrame).toInt()
|
||||||
var lastPos = -1
|
var lastPos = -1
|
||||||
var stalledCount = 0
|
var stalledCount = 0
|
||||||
|
var retried = false
|
||||||
while (!writerShouldStop) {
|
while (!writerShouldStop) {
|
||||||
val pos = t.playbackHeadPosition
|
val pos = t.playbackHeadPosition
|
||||||
if (pos >= totalFrames) break
|
if (pos >= totalFrames) break
|
||||||
// Safety: wenn Position 2s nicht mehr vorwaerts → AudioTrack hing
|
|
||||||
if (pos == lastPos) {
|
if (pos == lastPos) {
|
||||||
stalledCount++
|
stalledCount++
|
||||||
|
// Nach 500ms Stillstand: AudioTrack-Quirk auf manchen
|
||||||
|
// Geraeten (OnePlus A12) — play() nochmal anstossen.
|
||||||
|
if (stalledCount == 10 && pos == 0 && !retried) {
|
||||||
|
retried = true
|
||||||
|
Log.w(TAG, "playback nicht angefahren — retry play()")
|
||||||
|
try { t.play() } catch (e: Exception) {
|
||||||
|
Log.w(TAG, "retry play() failed: ${e.message}")
|
||||||
|
}
|
||||||
|
}
|
||||||
if (stalledCount > 40) {
|
if (stalledCount > 40) {
|
||||||
Log.w(TAG, "playback stalled at $pos/$totalFrames — give up")
|
Log.w(TAG, "playback stalled at $pos/$totalFrames — give up")
|
||||||
break
|
break
|
||||||
@@ -253,6 +283,17 @@ class PcmStreamPlayerModule(reactContext: ReactApplicationContext) : ReactContex
|
|||||||
} catch (_: Exception) {}
|
} catch (_: Exception) {}
|
||||||
try { t.stop() } catch (_: Exception) {}
|
try { t.stop() } catch (_: Exception) {}
|
||||||
try { t.release() } catch (_: Exception) {}
|
try { t.release() } catch (_: Exception) {}
|
||||||
|
// RN-Event: AudioTrack ist wirklich durch (alle Samples gespielt).
|
||||||
|
// JS released erst JETZT den AudioFocus — sonst spielt Spotify
|
||||||
|
// beim end()-Cap waehrend ARIA noch redet (15s+ je nach Buffer).
|
||||||
|
try {
|
||||||
|
val params = Arguments.createMap()
|
||||||
|
reactApplicationContext
|
||||||
|
.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
|
||||||
|
.emit("PcmPlaybackFinished", params)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Log.w(TAG, "PlaybackFinished emit failed: ${e.message}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}, "PcmStreamWriter").apply { start() }
|
}, "PcmStreamWriter").apply { start() }
|
||||||
|
|
||||||
@@ -309,6 +350,9 @@ class PcmStreamPlayerModule(reactContext: ReactApplicationContext) : ReactContex
|
|||||||
promise.resolve(true)
|
promise.resolve(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ReactMethod fun addListener(eventName: String) {}
|
||||||
|
@ReactMethod fun removeListeners(count: Int) {}
|
||||||
|
|
||||||
private fun stopInternal() {
|
private fun stopInternal() {
|
||||||
writerShouldStop = true
|
writerShouldStop = true
|
||||||
endRequested = true
|
endRequested = true
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "aria-cockpit",
|
"name": "aria-cockpit",
|
||||||
"version": "0.0.8.2",
|
"version": "0.1.0.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"android": "react-native run-android",
|
"android": "react-native run-android",
|
||||||
|
|||||||
@@ -80,6 +80,45 @@ const capMessages = (msgs: ChatMessage[]): ChatMessage[] =>
|
|||||||
const DEFAULT_ATTACHMENT_DIR = `${RNFS.DocumentDirectoryPath}/chat_attachments`;
|
const DEFAULT_ATTACHMENT_DIR = `${RNFS.DocumentDirectoryPath}/chat_attachments`;
|
||||||
const STORAGE_PATH_KEY = 'aria_attachment_storage_path';
|
const STORAGE_PATH_KEY = 'aria_attachment_storage_path';
|
||||||
|
|
||||||
|
/** Image-Vorschau in der Chat-Bubble. Misst die echte Bild-Dimension via
|
||||||
|
* Image.getSize + setzt aspectRatio dynamisch — dadurch passt sich die
|
||||||
|
* Bubble ans Bild an (kein "Strich" mehr bei breiten oder hohen Bildern). */
|
||||||
|
const CHAT_IMAGE_STYLE = {
|
||||||
|
width: 260,
|
||||||
|
borderRadius: 8,
|
||||||
|
marginBottom: 6,
|
||||||
|
backgroundColor: '#0D0D1A',
|
||||||
|
} as const;
|
||||||
|
const ChatImage: React.FC<{
|
||||||
|
uri: string;
|
||||||
|
onPress: () => void;
|
||||||
|
onError: () => void;
|
||||||
|
}> = ({ uri, onPress, onError }) => {
|
||||||
|
const [aspectRatio, setAspectRatio] = useState<number>(4 / 3);
|
||||||
|
useEffect(() => {
|
||||||
|
let cancelled = false;
|
||||||
|
Image.getSize(uri, (w, h) => {
|
||||||
|
if (!cancelled && w > 0 && h > 0) {
|
||||||
|
// Aspect-Ratio capen damit sehr lange Panorama-Bilder oder hohe
|
||||||
|
// Screenshot-Streifen die Bubble nicht sprengen
|
||||||
|
const r = Math.max(0.5, Math.min(2.5, w / h));
|
||||||
|
setAspectRatio(r);
|
||||||
|
}
|
||||||
|
}, () => {});
|
||||||
|
return () => { cancelled = true; };
|
||||||
|
}, [uri]);
|
||||||
|
return (
|
||||||
|
<TouchableOpacity onPress={onPress} activeOpacity={0.8}>
|
||||||
|
<Image
|
||||||
|
source={{ uri }}
|
||||||
|
style={[CHAT_IMAGE_STYLE, { aspectRatio }]}
|
||||||
|
resizeMode="cover"
|
||||||
|
onError={onError}
|
||||||
|
/>
|
||||||
|
</TouchableOpacity>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
async function getAttachmentDir(): Promise<string> {
|
async function getAttachmentDir(): Promise<string> {
|
||||||
try {
|
try {
|
||||||
const saved = await AsyncStorage.getItem(STORAGE_PATH_KEY);
|
const saved = await AsyncStorage.getItem(STORAGE_PATH_KEY);
|
||||||
@@ -154,7 +193,9 @@ const ChatScreen: React.FC = () => {
|
|||||||
const enabled = await AsyncStorage.getItem('aria_tts_enabled');
|
const enabled = await AsyncStorage.getItem('aria_tts_enabled');
|
||||||
setTtsDeviceEnabled(enabled !== 'false'); // default true
|
setTtsDeviceEnabled(enabled !== 'false'); // default true
|
||||||
const muted = await AsyncStorage.getItem('aria_tts_muted');
|
const muted = await AsyncStorage.getItem('aria_tts_muted');
|
||||||
setTtsMuted(muted === 'true'); // default false
|
const isMuted = muted === 'true';
|
||||||
|
setTtsMuted(isMuted); // default false
|
||||||
|
audioService.setMuted(isMuted); // service-internen Flag synchronisieren
|
||||||
const voice = await AsyncStorage.getItem('aria_xtts_voice');
|
const voice = await AsyncStorage.getItem('aria_xtts_voice');
|
||||||
localXttsVoiceRef.current = voice || '';
|
localXttsVoiceRef.current = voice || '';
|
||||||
ttsSpeedRef.current = await loadTtsSpeed();
|
ttsSpeedRef.current = await loadTtsSpeed();
|
||||||
@@ -229,11 +270,15 @@ const ChatScreen: React.FC = () => {
|
|||||||
setTtsMuted(prev => {
|
setTtsMuted(prev => {
|
||||||
const next = !prev;
|
const next = !prev;
|
||||||
AsyncStorage.setItem('aria_tts_muted', String(next));
|
AsyncStorage.setItem('aria_tts_muted', String(next));
|
||||||
// Bei Muten sofort laufende Wiedergabe stoppen
|
// Ref synchron updaten — sonst kommen noch Chunks im selben Tick
|
||||||
if (next) audioService.stopPlayback();
|
// mit canPlay=true durch (Race vor dem useEffect-Update).
|
||||||
|
ttsCanPlayRef.current = ttsDeviceEnabled && !next;
|
||||||
|
// Globalen Mute-Flag im audioService setzen — uebersteuert auch
|
||||||
|
// payload.silent in handlePcmChunk und stoppt laufende Wiedergabe.
|
||||||
|
audioService.setMuted(next);
|
||||||
return next;
|
return next;
|
||||||
});
|
});
|
||||||
}, []);
|
}, [ttsDeviceEnabled]);
|
||||||
|
|
||||||
// Chat-Verlauf aus AsyncStorage laden
|
// Chat-Verlauf aus AsyncStorage laden
|
||||||
const isInitialLoad = useRef(true);
|
const isInitialLoad = useRef(true);
|
||||||
@@ -450,6 +495,8 @@ const ChatScreen: React.FC = () => {
|
|||||||
const activity = (message.payload.activity as string) || 'idle';
|
const activity = (message.payload.activity as string) || 'idle';
|
||||||
const tool = (message.payload.tool as string) || '';
|
const tool = (message.payload.tool as string) || '';
|
||||||
setAgentActivity({ activity, tool });
|
setAgentActivity({ activity, tool });
|
||||||
|
// Spotify darf waehrend "ARIA denkt/schreibt" weiterspielen — pausiert
|
||||||
|
// nur wenn TTS startet (dann acquired _firePlaybackStarted den Focus).
|
||||||
}
|
}
|
||||||
|
|
||||||
// Voice-Config aus Diagnostic — setzt die lokale App-Stimme auf den
|
// Voice-Config aus Diagnostic — setzt die lokale App-Stimme auf den
|
||||||
@@ -678,17 +725,23 @@ const ChatScreen: React.FC = () => {
|
|||||||
|
|
||||||
// GPS-Position holen (optional)
|
// GPS-Position holen (optional)
|
||||||
const getCurrentLocation = useCallback((): Promise<{ lat: number; lon: number } | null> => {
|
const getCurrentLocation = useCallback((): Promise<{ lat: number; lon: number } | null> => {
|
||||||
if (!gpsEnabled) return Promise.resolve(null);
|
if (!gpsEnabled) {
|
||||||
|
console.log('[GPS] gpsEnabled=false → kein Standort');
|
||||||
|
return Promise.resolve(null);
|
||||||
|
}
|
||||||
|
|
||||||
return new Promise((resolve) => {
|
return new Promise((resolve) => {
|
||||||
Geolocation.getCurrentPosition(
|
Geolocation.getCurrentPosition(
|
||||||
(position) => {
|
(position) => {
|
||||||
resolve({
|
const loc = {
|
||||||
lat: position.coords.latitude,
|
lat: position.coords.latitude,
|
||||||
lon: position.coords.longitude,
|
lon: position.coords.longitude,
|
||||||
});
|
};
|
||||||
|
console.log('[GPS] Position: lat=%s lon=%s', loc.lat, loc.lon);
|
||||||
|
resolve(loc);
|
||||||
},
|
},
|
||||||
(_error) => {
|
(error) => {
|
||||||
|
console.warn('[GPS] getCurrentPosition Fehler:', error?.code, error?.message);
|
||||||
resolve(null);
|
resolve(null);
|
||||||
},
|
},
|
||||||
{ enableHighAccuracy: false, timeout: 5000 },
|
{ enableHighAccuracy: false, timeout: 5000 },
|
||||||
@@ -837,6 +890,7 @@ const ChatScreen: React.FC = () => {
|
|||||||
// Alle Pending Anhaenge + Text senden
|
// Alle Pending Anhaenge + Text senden
|
||||||
const sendPendingAttachments = useCallback(async (messageText: string) => {
|
const sendPendingAttachments = useCallback(async (messageText: string) => {
|
||||||
if (pendingAttachments.length === 0) return;
|
if (pendingAttachments.length === 0) return;
|
||||||
|
console.log('[Chat] sendPendingAttachments: %d Anhang/Anhaenge', pendingAttachments.length);
|
||||||
const location = await getCurrentLocation();
|
const location = await getCurrentLocation();
|
||||||
const msgId = nextId();
|
const msgId = nextId();
|
||||||
|
|
||||||
@@ -886,6 +940,8 @@ const ChatScreen: React.FC = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// An RVS senden
|
// An RVS senden
|
||||||
|
console.log('[Chat] sende file: name=%s mime=%s size=%s b64Bytes=%s',
|
||||||
|
name, mimeType, file.size, base64.length);
|
||||||
rvs.send('file', {
|
rvs.send('file', {
|
||||||
name,
|
name,
|
||||||
type: mimeType,
|
type: mimeType,
|
||||||
@@ -925,11 +981,9 @@ const ChatScreen: React.FC = () => {
|
|||||||
{item.attachments?.map((att, idx) => (
|
{item.attachments?.map((att, idx) => (
|
||||||
<View key={idx}>
|
<View key={idx}>
|
||||||
{att.type === 'image' && att.uri ? (
|
{att.type === 'image' && att.uri ? (
|
||||||
<TouchableOpacity onPress={() => setFullscreenImage(att.uri || null)} activeOpacity={0.8}>
|
<ChatImage
|
||||||
<Image
|
uri={att.uri}
|
||||||
source={{ uri: att.uri }}
|
onPress={() => setFullscreenImage(att.uri || null)}
|
||||||
style={styles.attachmentImage}
|
|
||||||
resizeMode="cover"
|
|
||||||
onError={() => {
|
onError={() => {
|
||||||
setMessages(prev => prev.map(m =>
|
setMessages(prev => prev.map(m =>
|
||||||
m.id === item.id ? { ...m, attachments: m.attachments?.map((a, i) =>
|
m.id === item.id ? { ...m, attachments: m.attachments?.map((a, i) =>
|
||||||
@@ -938,7 +992,6 @@ const ChatScreen: React.FC = () => {
|
|||||||
));
|
));
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</TouchableOpacity>
|
|
||||||
) : att.type === 'image' && !att.uri ? (
|
) : att.type === 'image' && !att.uri ? (
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={styles.attachmentFile}
|
style={styles.attachmentFile}
|
||||||
@@ -1341,9 +1394,11 @@ const styles = StyleSheet.create({
|
|||||||
color: '#E0E0F0',
|
color: '#E0E0F0',
|
||||||
},
|
},
|
||||||
attachmentImage: {
|
attachmentImage: {
|
||||||
width: '100%',
|
// Feste Breite + dynamische aspectRatio (in ChatImage gesetzt) damit die
|
||||||
minHeight: 200,
|
// Bubble sich ans Bild anpasst. Mit width: '100%' ohne explizite Parent-
|
||||||
maxHeight: 400,
|
// Breite wuerde RN das Bild auf 0px schrumpfen → "Strich".
|
||||||
|
width: 260,
|
||||||
|
aspectRatio: 4 / 3,
|
||||||
borderRadius: 8,
|
borderRadius: 8,
|
||||||
marginBottom: 6,
|
marginBottom: 6,
|
||||||
backgroundColor: '#0D0D1A',
|
backgroundColor: '#0D0D1A',
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ import {
|
|||||||
ToastAndroid,
|
ToastAndroid,
|
||||||
ActivityIndicator,
|
ActivityIndicator,
|
||||||
Modal,
|
Modal,
|
||||||
|
PermissionsAndroid,
|
||||||
} from 'react-native';
|
} from 'react-native';
|
||||||
import AsyncStorage from '@react-native-async-storage/async-storage';
|
import AsyncStorage from '@react-native-async-storage/async-storage';
|
||||||
import RNFS from 'react-native-fs';
|
import RNFS from 'react-native-fs';
|
||||||
@@ -63,6 +64,7 @@ import wakeWordService, {
|
|||||||
import ModeSelector from '../components/ModeSelector';
|
import ModeSelector from '../components/ModeSelector';
|
||||||
import QRScanner from '../components/QRScanner';
|
import QRScanner from '../components/QRScanner';
|
||||||
import VoiceCloneModal from '../components/VoiceCloneModal';
|
import VoiceCloneModal from '../components/VoiceCloneModal';
|
||||||
|
import updateService from '../services/updater';
|
||||||
|
|
||||||
const STORAGE_PATH_KEY = 'aria_attachment_storage_path';
|
const STORAGE_PATH_KEY = 'aria_attachment_storage_path';
|
||||||
const DEFAULT_STORAGE_PATH = `${RNFS.DocumentDirectoryPath}/chat_attachments`;
|
const DEFAULT_STORAGE_PATH = `${RNFS.DocumentDirectoryPath}/chat_attachments`;
|
||||||
@@ -132,6 +134,7 @@ const SettingsScreen: React.FC = () => {
|
|||||||
// null = automatisch (adaptive Baseline), sonst manueller dB-Override
|
// null = automatisch (adaptive Baseline), sonst manueller dB-Override
|
||||||
const [vadSilenceDb, setVadSilenceDb] = useState<number | null>(null);
|
const [vadSilenceDb, setVadSilenceDb] = useState<number | null>(null);
|
||||||
const [showVadInfo, setShowVadInfo] = useState(false);
|
const [showVadInfo, setShowVadInfo] = useState(false);
|
||||||
|
const [apkCacheInfo, setApkCacheInfo] = useState<{count: number, totalMB: number} | null>(null);
|
||||||
const [ttsSpeed, setTtsSpeed] = useState<number>(TTS_SPEED_DEFAULT);
|
const [ttsSpeed, setTtsSpeed] = useState<number>(TTS_SPEED_DEFAULT);
|
||||||
const [wakeKeyword, setWakeKeyword] = useState<string>(DEFAULT_KEYWORD);
|
const [wakeKeyword, setWakeKeyword] = useState<string>(DEFAULT_KEYWORD);
|
||||||
const [wakeStatus, setWakeStatus] = useState<string>('');
|
const [wakeStatus, setWakeStatus] = useState<string>('');
|
||||||
@@ -220,6 +223,7 @@ const SettingsScreen: React.FC = () => {
|
|||||||
if (saved && (WAKE_KEYWORDS as readonly string[]).includes(saved)) setWakeKeyword(saved);
|
if (saved && (WAKE_KEYWORDS as readonly string[]).includes(saved)) setWakeKeyword(saved);
|
||||||
});
|
});
|
||||||
isWakeReadySoundEnabled().then(setWakeReadySound);
|
isWakeReadySoundEnabled().then(setWakeReadySound);
|
||||||
|
updateService.getApkCacheSize().then(setApkCacheInfo).catch(() => {});
|
||||||
AsyncStorage.getItem('aria_xtts_voice').then(saved => {
|
AsyncStorage.getItem('aria_xtts_voice').then(saved => {
|
||||||
if (saved) setXttsVoice(saved);
|
if (saved) setXttsVoice(saved);
|
||||||
});
|
});
|
||||||
@@ -454,7 +458,29 @@ const SettingsScreen: React.FC = () => {
|
|||||||
|
|
||||||
// --- GPS Toggle ---
|
// --- GPS Toggle ---
|
||||||
|
|
||||||
const handleGPSToggle = useCallback((value: boolean) => {
|
const handleGPSToggle = useCallback(async (value: boolean) => {
|
||||||
|
if (value && Platform.OS === 'android') {
|
||||||
|
try {
|
||||||
|
const granted = await PermissionsAndroid.request(
|
||||||
|
PermissionsAndroid.PERMISSIONS.ACCESS_COARSE_LOCATION,
|
||||||
|
{
|
||||||
|
title: 'ARIA — Standort an Anfragen anhaengen',
|
||||||
|
message: 'Damit ARIA bei Anfragen wie "Wo ist der naechste...?" den '
|
||||||
|
+ 'Standort kennt, darf die App den ungefaehren Standort lesen. '
|
||||||
|
+ 'Wird nur bei jeder Anfrage einmal abgerufen, nicht im Hintergrund.',
|
||||||
|
buttonPositive: 'Erlauben',
|
||||||
|
buttonNegative: 'Abbrechen',
|
||||||
|
},
|
||||||
|
);
|
||||||
|
if (granted !== PermissionsAndroid.RESULTS.GRANTED) {
|
||||||
|
ToastAndroid.show('Standort-Berechtigung abgelehnt', ToastAndroid.SHORT);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.warn('[Settings] GPS-Permission Request gescheitert:', err);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
setGpsEnabled(value);
|
setGpsEnabled(value);
|
||||||
AsyncStorage.setItem('aria_gps_enabled', String(value)).catch(() => {});
|
AsyncStorage.setItem('aria_gps_enabled', String(value)).catch(() => {});
|
||||||
}, []);
|
}, []);
|
||||||
@@ -1194,6 +1220,37 @@ const SettingsScreen: React.FC = () => {
|
|||||||
)}
|
)}
|
||||||
</View>
|
</View>
|
||||||
|
|
||||||
|
{/* === Update-Cache === */}
|
||||||
|
<Text style={[styles.sectionTitle, {marginTop: 16}]}>Update-Cache</Text>
|
||||||
|
<View style={styles.card}>
|
||||||
|
<Text style={styles.toggleHint}>
|
||||||
|
Heruntergeladene APK-Dateien fuer App-Updates. Werden automatisch
|
||||||
|
beim App-Start und vor jedem neuen Download geloescht — der Button
|
||||||
|
ist fuer den Notfall (z.B. wenn ein Download haengen geblieben ist).
|
||||||
|
</Text>
|
||||||
|
<Text style={[styles.storageSizeText, {marginTop: 8}]}>
|
||||||
|
{apkCacheInfo === null ? '...' :
|
||||||
|
apkCacheInfo.count === 0 ? 'leer' :
|
||||||
|
`${apkCacheInfo.count} APK${apkCacheInfo.count === 1 ? '' : 's'} · ${apkCacheInfo.totalMB.toFixed(1)}MB`}
|
||||||
|
</Text>
|
||||||
|
<TouchableOpacity
|
||||||
|
style={[styles.clearButton, {marginTop: 8, backgroundColor: 'rgba(255,59,48,0.15)'}]}
|
||||||
|
onPress={async () => {
|
||||||
|
const res = await updateService.cleanupOldApks();
|
||||||
|
ToastAndroid.show(
|
||||||
|
res.removed === 0
|
||||||
|
? 'Update-Cache war schon leer'
|
||||||
|
: `${res.removed} APK${res.removed === 1 ? '' : 's'} geloescht (${res.freedMB.toFixed(1)}MB frei)`,
|
||||||
|
ToastAndroid.SHORT,
|
||||||
|
);
|
||||||
|
const info = await updateService.getApkCacheSize();
|
||||||
|
setApkCacheInfo(info);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Text style={[styles.clearButtonText, {color: '#FF3B30'}]}>Update-Cache leeren</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
</View>
|
||||||
|
|
||||||
</>)}
|
</>)}
|
||||||
|
|
||||||
{/* === Logs === */}
|
{/* === Logs === */}
|
||||||
|
|||||||
+256
-21
@@ -6,7 +6,7 @@
|
|||||||
* Nutzt react-native-audio-recorder-player fuer Aufnahme.
|
* Nutzt react-native-audio-recorder-player fuer Aufnahme.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { Platform, PermissionsAndroid, NativeModules, ToastAndroid } from 'react-native';
|
import { Platform, PermissionsAndroid, NativeModules, ToastAndroid, NativeEventEmitter } from 'react-native';
|
||||||
import Sound from 'react-native-sound';
|
import Sound from 'react-native-sound';
|
||||||
import RNFS from 'react-native-fs';
|
import RNFS from 'react-native-fs';
|
||||||
import AsyncStorage from '@react-native-async-storage/async-storage';
|
import AsyncStorage from '@react-native-async-storage/async-storage';
|
||||||
@@ -90,7 +90,7 @@ const VAD_SPEECH_MIN_MS = 500; // ms Sprache bevor Aufnahme zaehlt — l
|
|||||||
// nicht zuverlaessig greift. Range -55..-15 dB. Speech-Schwelle wird auf
|
// nicht zuverlaessig greift. Range -55..-15 dB. Speech-Schwelle wird auf
|
||||||
// override+10 dB gesetzt (Speech muss klar lauter als Stille sein).
|
// override+10 dB gesetzt (Speech muss klar lauter als Stille sein).
|
||||||
export const VAD_SILENCE_DB_DEFAULT = -38; // wenn User Manuell-Modus waehlt
|
export const VAD_SILENCE_DB_DEFAULT = -38; // wenn User Manuell-Modus waehlt
|
||||||
export const VAD_SILENCE_DB_MIN = -55; // sehr empfindlich, fast jeder Pegel ist "Sprache"
|
export const VAD_SILENCE_DB_MIN = -85; // extrem empfindlich, praktisch alles gilt als Sprache
|
||||||
export const VAD_SILENCE_DB_MAX = -15; // sehr unempfindlich, nur lautes Reden gilt
|
export const VAD_SILENCE_DB_MAX = -15; // sehr unempfindlich, nur lautes Reden gilt
|
||||||
export const VAD_SILENCE_DB_OVERRIDE_KEY = 'aria_vad_silence_db_override';
|
export const VAD_SILENCE_DB_OVERRIDE_KEY = 'aria_vad_silence_db_override';
|
||||||
|
|
||||||
@@ -269,9 +269,38 @@ class AudioService {
|
|||||||
private vadAdaptiveSilenceDb: number = VAD_SILENCE_FALLBACK_DB;
|
private vadAdaptiveSilenceDb: number = VAD_SILENCE_FALLBACK_DB;
|
||||||
private vadAdaptiveSpeechDb: number = VAD_SPEECH_FALLBACK_DB;
|
private vadAdaptiveSpeechDb: number = VAD_SPEECH_FALLBACK_DB;
|
||||||
|
|
||||||
|
// Interruption-Tracking fuer Auto-Resume nach Anruf:
|
||||||
|
// - playbackStartTime: ms-Timestamp wenn AudioTrack tatsaechlich anfing
|
||||||
|
// abzuspielen (= _firePlaybackStarted)
|
||||||
|
// - currentPlaybackMsgId: welche Antwort lief gerade
|
||||||
|
// - pausedPosition / pausedMessageId: bei captureInterruption gemerkt
|
||||||
|
private playbackStartTime: number = 0;
|
||||||
|
private currentPlaybackMsgId: string = '';
|
||||||
|
private pausedPosition: number = 0; // Sekunden in der Audio-Datei
|
||||||
|
private pausedMessageId: string = '';
|
||||||
|
private resumeSound: Sound | null = null; // halten damit GC nicht zuschlaegt
|
||||||
|
// Leading-Silence wird im Native vor den Chunks geschrieben — beim
|
||||||
|
// Position-Berechnen vom playbackStarted abziehen
|
||||||
|
private readonly LEADING_SILENCE_SEC = 0.3;
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
this.recorder = new AudioRecorderPlayer();
|
this.recorder = new AudioRecorderPlayer();
|
||||||
this.recorder.setSubscriptionDuration(0.1); // 100ms Metering-Updates
|
this.recorder.setSubscriptionDuration(0.1); // 100ms Metering-Updates
|
||||||
|
// Native Event: AudioTrack hat alle Samples wirklich durchgespielt (nach
|
||||||
|
// dem finally{}-Block im Writer-Thread). ERST jetzt darf AudioFocus
|
||||||
|
// freigegeben werden — sonst spielt Spotify schon waehrend ARIA noch
|
||||||
|
// redet (PcmStreamPlayer.end() returnt mit 15s-Cap viel zu frueh).
|
||||||
|
if (PcmStreamPlayer) {
|
||||||
|
try {
|
||||||
|
const emitter = new NativeEventEmitter(NativeModules.PcmStreamPlayer as any);
|
||||||
|
emitter.addListener('PcmPlaybackFinished', () => {
|
||||||
|
console.log('[Audio] PcmPlaybackFinished — Focus jetzt freigeben');
|
||||||
|
this._releaseFocusDeferred();
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
console.warn('[Audio] PcmPlaybackFinished-Subscription fehlgeschlagen:', err);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** AudioFocus mit kleiner Verzoegerung freigeben — Spotify/YouTube
|
/** AudioFocus mit kleiner Verzoegerung freigeben — Spotify/YouTube
|
||||||
@@ -318,14 +347,151 @@ class AudioService {
|
|||||||
this._releaseFocusDeferred();
|
this._releaseFocusDeferred();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** TTS-Wiedergabe haart stoppen — z.B. wenn ein Anruf reinkommt.
|
/** TTS-Wiedergabe haart stoppen — z.B. fuer Barge-In. Buffer wird geleert,
|
||||||
* Released auch sofort den AudioFocus damit der Anruf-Klingelton hoerbar ist. */
|
* kein Auto-Resume. Released auch sofort den AudioFocus. */
|
||||||
haltAllPlayback(reason: string = ''): void {
|
haltAllPlayback(reason: string = ''): void {
|
||||||
console.log('[Audio] haltAllPlayback: %s', reason || '(no reason)');
|
console.log('[Audio] haltAllPlayback: %s', reason || '(no reason)');
|
||||||
this._conversationFocusActive = false;
|
this._conversationFocusActive = false;
|
||||||
this.stopPlayback();
|
this.stopPlayback();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Speziell fuer Anrufe: AudioTrack stoppen + Focus releasen, ABER pcm-
|
||||||
|
* Buffer + messageId behalten damit weitere Chunks der unterbrochenen
|
||||||
|
* Antwort weiter gesammelt werden. isFinal schreibt dann die WAV trotz
|
||||||
|
* Anruf — und resumeFromInterruption findet sie. */
|
||||||
|
pauseForCall(reason: string = ''): void {
|
||||||
|
console.log('[Audio] pauseForCall: %s', reason || '(no reason)');
|
||||||
|
this._conversationFocusActive = false;
|
||||||
|
this._pausedForCall = true;
|
||||||
|
// Foreground-Service stoppen — Notification waere sonst irrefuehrend
|
||||||
|
stopBackgroundAudio().catch(() => {});
|
||||||
|
// SoundPool/RNSound (Resume-Sound, Play-Button) stoppen — nicht relevant fuer Auto-Resume
|
||||||
|
if (this.currentSound) {
|
||||||
|
try { this.currentSound.stop(); this.currentSound.release(); } catch {}
|
||||||
|
this.currentSound = null;
|
||||||
|
}
|
||||||
|
if (this.resumeSound) {
|
||||||
|
try { this.resumeSound.stop(); this.resumeSound.release(); } catch {}
|
||||||
|
this.resumeSound = null;
|
||||||
|
}
|
||||||
|
// AudioTrack hart stoppen damit nichts mehr aus dem Lautsprecher kommt.
|
||||||
|
// pcmStreamActive bleibt true, pcmBuffer/pcmMessageId BLEIBEN — damit
|
||||||
|
// weitere Chunks gesammelt werden und isFinal die WAV schreiben kann.
|
||||||
|
PcmStreamPlayer?.stop().catch(() => {});
|
||||||
|
this._cancelDeferredFocusRelease();
|
||||||
|
AudioFocus?.release().catch(() => {});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Anruf vorbei → weitere Chunks duerfen wieder abgespielt werden.
|
||||||
|
* resumeFromInterruption uebernimmt die Wiedergabe ab gemerkter Position. */
|
||||||
|
endCallPause(): void {
|
||||||
|
if (!this._pausedForCall) return;
|
||||||
|
this._pausedForCall = false;
|
||||||
|
console.log('[Audio] endCallPause');
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Bei Anruf: aktuelle Wiedergabe-Position merken damit wir nach dem
|
||||||
|
* Auflegen von dort weitermachen koennen. Returnt Position in Sekunden
|
||||||
|
* oder 0 wenn nichts spielte.
|
||||||
|
*
|
||||||
|
* Idempotent: bei mehrfachem Aufruf (ringing → offhook) wird die Position
|
||||||
|
* vom ersten Mal NICHT ueberschrieben. playbackStartTime laeuft stumpf
|
||||||
|
* weiter obwohl das Audio gestoppt ist — der erste Halt ist der echte. */
|
||||||
|
captureInterruption(): number {
|
||||||
|
if (this.pausedMessageId) {
|
||||||
|
console.log('[Audio] captureInterruption: bereits erfasst (msgId=%s pos=%ss) — skip',
|
||||||
|
this.pausedMessageId, this.pausedPosition.toFixed(2));
|
||||||
|
return this.pausedPosition;
|
||||||
|
}
|
||||||
|
if (!this.playbackStartTime || !this.currentPlaybackMsgId) {
|
||||||
|
console.log('[Audio] captureInterruption: nichts spielte (startTime=%s, msgId=%s)',
|
||||||
|
this.playbackStartTime, this.currentPlaybackMsgId || '(leer)');
|
||||||
|
this.pausedPosition = 0;
|
||||||
|
this.pausedMessageId = '';
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
const elapsedMs = Date.now() - this.playbackStartTime;
|
||||||
|
const positionSec = Math.max(0, elapsedMs / 1000 - this.LEADING_SILENCE_SEC);
|
||||||
|
this.pausedPosition = positionSec;
|
||||||
|
this.pausedMessageId = this.currentPlaybackMsgId;
|
||||||
|
console.log('[Audio] captureInterruption: msgId=%s pos=%ss',
|
||||||
|
this.pausedMessageId, positionSec.toFixed(2));
|
||||||
|
return positionSec;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Nach Anruf-Ende: ab gemerkter Position weiterspielen. Wenn Cache noch
|
||||||
|
* nicht geschrieben (final kam waehrend Anruf vielleicht doch nicht),
|
||||||
|
* warten bis maxWaitMs und dann probieren. Returnt true wenn gestartet. */
|
||||||
|
async resumeFromInterruption(maxWaitMs: number = 30000): Promise<boolean> {
|
||||||
|
const msgId = this.pausedMessageId;
|
||||||
|
const position = this.pausedPosition;
|
||||||
|
if (!msgId) {
|
||||||
|
console.log('[Audio] resumeFromInterruption: kein gemerkter Stand — skip');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
console.log('[Audio] resumeFromInterruption: starte fuer msgId=%s pos=%ss',
|
||||||
|
msgId, position.toFixed(2));
|
||||||
|
this.pausedMessageId = ''; // konsumieren
|
||||||
|
const cachePath = `${RNFS.DocumentDirectoryPath}/tts_cache/${msgId}.wav`;
|
||||||
|
const startTime = Date.now();
|
||||||
|
while (Date.now() - startTime < maxWaitMs) {
|
||||||
|
try {
|
||||||
|
if (await RNFS.exists(cachePath)) {
|
||||||
|
return await this._playFromPathAtPosition(cachePath, position);
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
|
await new Promise(r => setTimeout(r, 500));
|
||||||
|
}
|
||||||
|
console.warn('[Audio] resumeFromInterruption: WAV %s nicht binnen %dms verfuegbar',
|
||||||
|
msgId, maxWaitMs);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async _playFromPathAtPosition(path: string, positionSec: number): Promise<boolean> {
|
||||||
|
try {
|
||||||
|
// Bestehende laufende Wiedergabe abbrechen damit wir sauber starten
|
||||||
|
if (this.resumeSound) {
|
||||||
|
try { this.resumeSound.stop(); this.resumeSound.release(); } catch {}
|
||||||
|
this.resumeSound = null;
|
||||||
|
}
|
||||||
|
const sound = await new Promise<Sound>((resolve, reject) => {
|
||||||
|
const s = new Sound(path.replace(/^file:\/\//, ''), '', (err) =>
|
||||||
|
err ? reject(err) : resolve(s));
|
||||||
|
});
|
||||||
|
// Audio-Focus anfordern damit Spotify pausiert
|
||||||
|
this._cancelDeferredFocusRelease();
|
||||||
|
AudioFocus?.requestDuck().catch(() => {});
|
||||||
|
this._firePlaybackStarted();
|
||||||
|
this.isPlaying = true;
|
||||||
|
this.resumeSound = sound;
|
||||||
|
// Tracking auch fuer den Resume-Sound aktualisieren — sonst kann
|
||||||
|
// captureInterruption bei einem zweiten Anruf die Position nicht
|
||||||
|
// mehr ermitteln (playbackStartTime waere von der ersten Wiedergabe).
|
||||||
|
const msgIdMatch = path.match(/([^/\\]+)\.wav$/i);
|
||||||
|
if (msgIdMatch) this.currentPlaybackMsgId = msgIdMatch[1];
|
||||||
|
// Virtuelle Start-Zeit so setzen, dass captureInterruption (das den
|
||||||
|
// Leading-Silence-Offset wieder abzieht) die korrekte Position liefert.
|
||||||
|
this.playbackStartTime = Date.now() - (positionSec + this.LEADING_SILENCE_SEC) * 1000;
|
||||||
|
console.log('[Audio] Resume von Position %ss aus %s',
|
||||||
|
positionSec.toFixed(2), path);
|
||||||
|
sound.setCurrentTime(Math.max(0, positionSec));
|
||||||
|
sound.play((success) => {
|
||||||
|
if (!success) console.warn('[Audio] Resume-Wiedergabe fehlgeschlagen');
|
||||||
|
try { sound.release(); } catch {}
|
||||||
|
if (this.resumeSound === sound) this.resumeSound = null;
|
||||||
|
this.isPlaying = false;
|
||||||
|
this.playbackFinishedListeners.forEach(cb => {
|
||||||
|
try { cb(); } catch (e) { console.warn('[Audio] cb err:', e); }
|
||||||
|
});
|
||||||
|
this._releaseFocusDeferred();
|
||||||
|
});
|
||||||
|
return true;
|
||||||
|
} catch (err: any) {
|
||||||
|
console.warn('[Audio] _playFromPathAtPosition fehlgeschlagen:', err?.message || err);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/** True wenn ARIA gerade was abspielt — egal ob WAV-Queue oder PCM-Stream.
|
/** True wenn ARIA gerade was abspielt — egal ob WAV-Queue oder PCM-Stream.
|
||||||
* Nuetzlich fuer "Barge-In": wenn der User spricht waehrend ARIA spricht,
|
* Nuetzlich fuer "Barge-In": wenn der User spricht waehrend ARIA spricht,
|
||||||
* soll die ARIA-Wiedergabe abgebrochen + die neue User-Message verarbeitet
|
* soll die ARIA-Wiedergabe abgebrochen + die neue User-Message verarbeitet
|
||||||
@@ -610,7 +776,9 @@ class AudioService {
|
|||||||
/** Base64-kodiertes Audio in die Queue stellen und abspielen */
|
/** Base64-kodiertes Audio in die Queue stellen und abspielen */
|
||||||
async playAudio(base64Data: string): Promise<void> {
|
async playAudio(base64Data: string): Promise<void> {
|
||||||
if (!base64Data) return;
|
if (!base64Data) return;
|
||||||
|
// Mute-Flag respektieren — robust gegen Race-Conditions zwischen User-
|
||||||
|
// Klick auf Mute und einem TTS-Chunk der im selben Tick eintrifft.
|
||||||
|
if (this._muted) return;
|
||||||
this.audioQueue.push(base64Data);
|
this.audioQueue.push(base64Data);
|
||||||
if (!this.isPlaying) {
|
if (!this.isPlaying) {
|
||||||
this._playNext();
|
this._playNext();
|
||||||
@@ -677,7 +845,11 @@ class AudioService {
|
|||||||
final?: boolean;
|
final?: boolean;
|
||||||
silent?: boolean;
|
silent?: boolean;
|
||||||
}): Promise<string> {
|
}): Promise<string> {
|
||||||
const silent = !!payload.silent;
|
// Globaler Mute-Flag uebersteuert das per-Call silent — verhindert
|
||||||
|
// Race-Conditions wenn der User zwischen Chunks den Mute-Knopf drueckt.
|
||||||
|
// _pausedForCall: AudioTrack ist gestoppt waehrend Anruf — Chunks weiter
|
||||||
|
// sammeln (fuer WAV-Cache), aber NICHT in den Player schicken.
|
||||||
|
const silent = !!payload.silent || this._muted || this._pausedForCall;
|
||||||
if (!silent && !PcmStreamPlayer) {
|
if (!silent && !PcmStreamPlayer) {
|
||||||
console.warn('[Audio] PcmStreamPlayer Native Module nicht verfuegbar');
|
console.warn('[Audio] PcmStreamPlayer Native Module nicht verfuegbar');
|
||||||
return '';
|
return '';
|
||||||
@@ -703,6 +875,21 @@ class AudioService {
|
|||||||
this.pcmBuffer = [];
|
this.pcmBuffer = [];
|
||||||
this.pcmBytesCollected = 0;
|
this.pcmBytesCollected = 0;
|
||||||
}
|
}
|
||||||
|
// Resume-Sound stoppen falls noch aktiv (User hat nach Anruf eine
|
||||||
|
// neue Frage gestellt — die alte interruptierte Antwort ist obsolet).
|
||||||
|
if (this.resumeSound) {
|
||||||
|
try { this.resumeSound.stop(); this.resumeSound.release(); } catch {}
|
||||||
|
this.resumeSound = null;
|
||||||
|
}
|
||||||
|
// Pending Auto-Resume verwerfen wenn die neue Antwort eine andere
|
||||||
|
// messageId hat. Sonst spielt nach 30s-Wartezeit der Resume die
|
||||||
|
// ueberholte Antwort ab.
|
||||||
|
if (this.pausedMessageId && this.pausedMessageId !== messageId) {
|
||||||
|
console.log('[Audio] Neue TTS-Antwort (msgId=%s) — Auto-Resume fuer %s verworfen',
|
||||||
|
messageId, this.pausedMessageId);
|
||||||
|
this.pausedMessageId = '';
|
||||||
|
this.pausedPosition = 0;
|
||||||
|
}
|
||||||
this.pcmStreamActive = true;
|
this.pcmStreamActive = true;
|
||||||
this.pcmMessageId = messageId;
|
this.pcmMessageId = messageId;
|
||||||
this.pcmSampleRate = sampleRate;
|
this.pcmSampleRate = sampleRate;
|
||||||
@@ -737,13 +924,16 @@ class AudioService {
|
|||||||
|
|
||||||
if (isFinal) {
|
if (isFinal) {
|
||||||
if (!silent) {
|
if (!silent) {
|
||||||
// end() resolved jetzt erst wenn der native Writer-Thread fertig
|
// end() signalisiert dem Writer "keine weiteren Chunks". Aber WIR
|
||||||
// ist (alle Samples ausgespielt) — danach AudioFocus verzoegert
|
// releasen den AudioFocus NICHT hier — der writer braucht u.U. noch
|
||||||
// freigeben, damit Spotify/YouTube nicht im Mikro-Gap zwischen zwei
|
// 30+ Sekunden bis der Buffer wirklich abgespielt ist. Den release
|
||||||
// ARIA-Antworten wieder hochdrehen. Wenn ein neuer Stream innerhalb
|
// triggert das native Event "PcmPlaybackFinished" wenn AudioTrack
|
||||||
// FOCUS_RELEASE_DELAY_MS startet, wird das Release abgebrochen.
|
// wirklich am Ende ist (siehe ensurePlaybackFinishedListener).
|
||||||
try { await PcmStreamPlayer!.end(); } catch {}
|
try { await PcmStreamPlayer!.end(); } catch {}
|
||||||
this._releaseFocusDeferred();
|
// playbackFinished-Listener informieren (UI-Logik)
|
||||||
|
this.playbackFinishedListeners.forEach(cb => {
|
||||||
|
try { cb(); } catch (e) { console.warn('[Audio] playbackFinished cb err:', e); }
|
||||||
|
});
|
||||||
}
|
}
|
||||||
this.pcmStreamActive = false;
|
this.pcmStreamActive = false;
|
||||||
|
|
||||||
@@ -817,7 +1007,10 @@ class AudioService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Audio aus lokaler Datei (file:// Pfad) in die Queue und abspielen. */
|
/** Audio aus lokaler Datei (file:// Pfad) in die Queue und abspielen.
|
||||||
|
* Setzt zusaetzlich playbackStartTime + currentPlaybackMsgId damit ein
|
||||||
|
* Anruf waehrend dieses Playbacks korrekt erfasst wird (ohne dieses
|
||||||
|
* Tracking liefert captureInterruption nichts → kein Auto-Resume). */
|
||||||
async playFromPath(filePath: string): Promise<void> {
|
async playFromPath(filePath: string): Promise<void> {
|
||||||
if (!filePath) return;
|
if (!filePath) return;
|
||||||
try {
|
try {
|
||||||
@@ -826,6 +1019,14 @@ class AudioService {
|
|||||||
console.warn('[Audio] Cache-Datei existiert nicht mehr:', cleanPath);
|
console.warn('[Audio] Cache-Datei existiert nicht mehr:', cleanPath);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
// Dateiname ohne .wav als messageId nehmen (egal ob UUID oder andere ID)
|
||||||
|
const fileMatch = cleanPath.match(/([^/\\]+)\.wav$/i);
|
||||||
|
const msgId = fileMatch ? fileMatch[1] : '';
|
||||||
|
console.log('[Audio] playFromPath: cleanPath=%s → msgId=%s', cleanPath, msgId || '(leer)');
|
||||||
|
if (msgId) {
|
||||||
|
this.currentPlaybackMsgId = msgId;
|
||||||
|
this.playbackStartTime = Date.now() - this.LEADING_SILENCE_SEC * 1000;
|
||||||
|
}
|
||||||
const b64 = await RNFS.readFile(cleanPath, 'base64');
|
const b64 = await RNFS.readFile(cleanPath, 'base64');
|
||||||
this.playAudio(b64);
|
this.playAudio(b64);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
@@ -854,6 +1055,15 @@ class AudioService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private _firePlaybackStarted(): void {
|
private _firePlaybackStarted(): void {
|
||||||
|
// Tracking fuer Auto-Resume nach Anruf-Pause: NUR setzen wenn ein
|
||||||
|
// PCM-Stream laeuft (Live-TTS). Bei Play-Button / Resume-Sound hat der
|
||||||
|
// Caller (playFromPath / _playFromPathAtPosition) das Tracking schon
|
||||||
|
// korrekt mit der msgId aus dem Pfad gesetzt — sonst wuerden wir hier
|
||||||
|
// mit leerem pcmMessageId ueberschreiben.
|
||||||
|
if (this.pcmMessageId) {
|
||||||
|
this.playbackStartTime = Date.now();
|
||||||
|
this.currentPlaybackMsgId = this.pcmMessageId;
|
||||||
|
}
|
||||||
this.playbackStartedListeners.forEach(cb => {
|
this.playbackStartedListeners.forEach(cb => {
|
||||||
try { cb(); } catch (e) { console.warn('[Audio] playbackStarted listener err:', e); }
|
try { cb(); } catch (e) { console.warn('[Audio] playbackStarted listener err:', e); }
|
||||||
});
|
});
|
||||||
@@ -937,8 +1147,27 @@ class AudioService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Mute: alle eingehenden TTS-Chunks/WAVs werden ignoriert bis wieder
|
||||||
|
* unmuted. Robuster als ein React-Ref weil hier kein Re-Render-Race ist
|
||||||
|
* — die Bridge kann einen Chunk im selben JS-Tick liefern in dem der
|
||||||
|
* User Mute geklickt hat. */
|
||||||
|
private _muted: boolean = false;
|
||||||
|
/** Anruf laeuft → Chunks werden nur in den Cache-Buffer gepusht, nicht
|
||||||
|
* abgespielt. Wird in pauseForCall gesetzt, in endCallPause/resumeFrom-
|
||||||
|
* Interruption zurueckgenommen. */
|
||||||
|
private _pausedForCall: boolean = false;
|
||||||
|
setMuted(muted: boolean): void {
|
||||||
|
console.log('[Audio] setMuted: %s (currentSound=%s pcmStreamActive=%s)',
|
||||||
|
muted, this.currentSound ? 'aktiv' : 'null', this.pcmStreamActive);
|
||||||
|
this._muted = muted;
|
||||||
|
if (muted) this.stopPlayback();
|
||||||
|
}
|
||||||
|
isMuted(): boolean { return this._muted; }
|
||||||
|
|
||||||
/** Laufende Wiedergabe stoppen + Queue leeren */
|
/** Laufende Wiedergabe stoppen + Queue leeren */
|
||||||
stopPlayback(): void {
|
stopPlayback(): void {
|
||||||
|
console.log('[Audio] stopPlayback: currentSound=%s queue=%d pcm=%s',
|
||||||
|
this.currentSound ? 'aktiv' : 'null', this.audioQueue.length, this.pcmStreamActive);
|
||||||
// Foreground-Service auch stoppen — sonst bleibt die Notification haengen
|
// Foreground-Service auch stoppen — sonst bleibt die Notification haengen
|
||||||
// wenn Wiedergabe abgebrochen wird (Anruf, Cancel, Barge-In).
|
// wenn Wiedergabe abgebrochen wird (Anruf, Cancel, Barge-In).
|
||||||
stopBackgroundAudio().catch(() => {});
|
stopBackgroundAudio().catch(() => {});
|
||||||
@@ -949,20 +1178,26 @@ class AudioService {
|
|||||||
this.currentSound.release();
|
this.currentSound.release();
|
||||||
this.currentSound = null;
|
this.currentSound = null;
|
||||||
}
|
}
|
||||||
|
if (this.resumeSound) {
|
||||||
|
this.resumeSound.stop();
|
||||||
|
this.resumeSound.release();
|
||||||
|
this.resumeSound = null;
|
||||||
|
}
|
||||||
if (this.preloadedSound) {
|
if (this.preloadedSound) {
|
||||||
this.preloadedSound.release();
|
this.preloadedSound.release();
|
||||||
this.preloadedSound = null;
|
this.preloadedSound = null;
|
||||||
if (this.preloadedPath) RNFS.unlink(this.preloadedPath).catch(() => {});
|
if (this.preloadedPath) RNFS.unlink(this.preloadedPath).catch(() => {});
|
||||||
this.preloadedPath = '';
|
this.preloadedPath = '';
|
||||||
}
|
}
|
||||||
// PCM-Stream ebenfalls hart stoppen (Cancel/Abbruch)
|
// PCM-Stream ebenfalls hart stoppen (Cancel/Abbruch).
|
||||||
if (this.pcmStreamActive) {
|
// pcmStreamActive wird beim isFinal-Chunk schon false gesetzt — der
|
||||||
PcmStreamPlayer?.stop().catch(() => {});
|
// AudioTrack spielt aber noch sekundenlang aus seinem Buffer ab. Daher
|
||||||
this.pcmStreamActive = false;
|
// IMMER stop() aufrufen, ohne den Flag zu pruefen (ist idempotent).
|
||||||
this.pcmBuffer = [];
|
PcmStreamPlayer?.stop().catch(() => {});
|
||||||
this.pcmBytesCollected = 0;
|
this.pcmStreamActive = false;
|
||||||
this.pcmMessageId = '';
|
this.pcmBuffer = [];
|
||||||
}
|
this.pcmBytesCollected = 0;
|
||||||
|
this.pcmMessageId = '';
|
||||||
// Audio-Focus sofort freigeben — User hat explizit abgebrochen
|
// Audio-Focus sofort freigeben — User hat explizit abgebrochen
|
||||||
this._cancelDeferredFocusRelease();
|
this._cancelDeferredFocusRelease();
|
||||||
AudioFocus?.release().catch(() => {});
|
AudioFocus?.release().catch(() => {});
|
||||||
|
|||||||
@@ -1,14 +1,19 @@
|
|||||||
/**
|
/**
|
||||||
* PhoneCall-Service — pausiert die TTS-Wiedergabe wenn das Telefon klingelt
|
* PhoneCall-Service — pausiert ARIA bei Telefonaten:
|
||||||
* oder ein Anruf laeuft. Native-Bindung an PhoneCallModule.kt.
|
|
||||||
*
|
*
|
||||||
* Bei "ringing" oder "offhook" wird audioService.haltAllPlayback() gerufen —
|
* 1. Klassischer Mobilfunk-Anruf via TelephonyManager (PhoneCallModule.kt)
|
||||||
* ARIA verstummt sofort. Nach dem Auflegen passiert nichts automatisch
|
* Status: idle / ringing / offhook
|
||||||
* (Audio kommt nicht zurueck), der User muesste die Antwort manuell
|
|
||||||
* nochmal anfordern (Play-Button auf der Nachricht).
|
|
||||||
*
|
*
|
||||||
* Permission READ_PHONE_STATE muss vom Nutzer einmalig erteilt werden —
|
* 2. VoIP-Anrufe (WhatsApp, Signal, Discord, Telegram, Teams, ...) via
|
||||||
* wenn nicht, failed start() leise und der Rest funktioniert wie bisher.
|
* AudioFocus-Loss-Event (AudioFocusModule.kt). Diese Apps requestn
|
||||||
|
* AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE wenn ein Anruf reinkommt — wir
|
||||||
|
* bekommen ein "loss" Event und reagieren genauso wie auf RINGING.
|
||||||
|
*
|
||||||
|
* In beiden Faellen wird audioService.haltAllPlayback() + wakeWordService.
|
||||||
|
* pauseForCall() gerufen. Bei call-end (idle / focus-gain) → resumeFromCall.
|
||||||
|
*
|
||||||
|
* Permission READ_PHONE_STATE ist nur fuer Pfad 1 noetig — Pfad 2 braucht
|
||||||
|
* keine extra Berechtigung weil unser eigener AudioFocus-Listener feuert.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@@ -33,61 +38,76 @@ type PhoneState = 'idle' | 'ringing' | 'offhook';
|
|||||||
class PhoneCallService {
|
class PhoneCallService {
|
||||||
private started: boolean = false;
|
private started: boolean = false;
|
||||||
private subscription: { remove: () => void } | null = null;
|
private subscription: { remove: () => void } | null = null;
|
||||||
|
private focusSubscription: { remove: () => void } | null = null;
|
||||||
private lastState: PhoneState = 'idle';
|
private lastState: PhoneState = 'idle';
|
||||||
|
/** Damit Resume nach VoIP-Loss nicht doppelt feuert wenn auch
|
||||||
|
* TelephonyManager-IDLE-Event kommt. */
|
||||||
|
private interruptedByFocus: boolean = false;
|
||||||
|
|
||||||
async start(): Promise<boolean> {
|
async start(): Promise<boolean> {
|
||||||
if (this.started || !PhoneCall) return false;
|
if (this.started || Platform.OS !== 'android') return false;
|
||||||
if (Platform.OS !== 'android') return false;
|
|
||||||
|
|
||||||
// Runtime-Permission holen (nur einmal noetig)
|
// 1. AudioFocus-Listener IMMER registrieren — fangs VoIP-Calls (WhatsApp,
|
||||||
|
// Signal, Discord etc.) abdecken, brauchen keine Permission.
|
||||||
try {
|
try {
|
||||||
const granted = await PermissionsAndroid.request(
|
const focusEmitter = new NativeEventEmitter(NativeModules.AudioFocus as any);
|
||||||
PermissionsAndroid.PERMISSIONS.READ_PHONE_STATE,
|
this.focusSubscription = focusEmitter.addListener(
|
||||||
{
|
'AudioFocusChanged',
|
||||||
title: 'ARIA Cockpit — Anruf-Erkennung',
|
(e: { type: 'loss' | 'loss_transient' | 'gain' }) => this._onFocusChanged(e.type),
|
||||||
message: 'Damit ARIA bei einem eingehenden Anruf nicht weiterredet, '
|
|
||||||
+ 'darf die App den Anruf-Status sehen (Klingeln/Aktiv/Aufgelegt). '
|
|
||||||
+ 'Es werden keine Anrufdaten gelesen oder gespeichert.',
|
|
||||||
buttonPositive: 'Erlauben',
|
|
||||||
buttonNegative: 'Spaeter',
|
|
||||||
},
|
|
||||||
);
|
);
|
||||||
if (granted !== PermissionsAndroid.RESULTS.GRANTED) {
|
console.log('[PhoneCall] AudioFocus-Listener aktiv (fuer VoIP-Calls)');
|
||||||
console.warn('[PhoneCall] READ_PHONE_STATE Permission abgelehnt');
|
} catch (err: any) {
|
||||||
return false;
|
console.warn('[PhoneCall] AudioFocus-Subscription gescheitert', err?.message || err);
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
console.warn('[PhoneCall] Permission-Anfrage gescheitert', err);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
// 2. TelephonyManager-Listener — fuer klassische Mobilfunk-Anrufe
|
||||||
const ok = await PhoneCall.start();
|
if (PhoneCall) {
|
||||||
if (!ok) {
|
try {
|
||||||
console.warn('[PhoneCall] Native start() lieferte false (Permission?)');
|
const granted = await PermissionsAndroid.request(
|
||||||
return false;
|
PermissionsAndroid.PERMISSIONS.READ_PHONE_STATE,
|
||||||
|
{
|
||||||
|
title: 'ARIA Cockpit — Anruf-Erkennung',
|
||||||
|
message: 'Damit ARIA bei einem eingehenden Anruf nicht weiterredet, '
|
||||||
|
+ 'darf die App den Anruf-Status sehen (Klingeln/Aktiv/Aufgelegt). '
|
||||||
|
+ 'Es werden keine Anrufdaten gelesen oder gespeichert.',
|
||||||
|
buttonPositive: 'Erlauben',
|
||||||
|
buttonNegative: 'Spaeter',
|
||||||
|
},
|
||||||
|
);
|
||||||
|
if (granted === PermissionsAndroid.RESULTS.GRANTED) {
|
||||||
|
const ok = await PhoneCall.start();
|
||||||
|
if (ok) {
|
||||||
|
const emitter = new NativeEventEmitter(NativeModules.PhoneCall as any);
|
||||||
|
this.subscription = emitter.addListener(
|
||||||
|
'PhoneCallStateChanged',
|
||||||
|
(e: { state: PhoneState }) => this._onStateChanged(e.state),
|
||||||
|
);
|
||||||
|
console.log('[PhoneCall] TelephonyManager-Listener aktiv');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.warn('[PhoneCall] READ_PHONE_STATE abgelehnt — VoIP-Calls werden trotzdem ueber AudioFocus erkannt');
|
||||||
|
}
|
||||||
|
} catch (err: any) {
|
||||||
|
console.warn('[PhoneCall] TelephonyManager-Setup gescheitert:', err?.message || err);
|
||||||
}
|
}
|
||||||
const emitter = new NativeEventEmitter(NativeModules.PhoneCall as any);
|
|
||||||
this.subscription = emitter.addListener('PhoneCallStateChanged', (e: { state: PhoneState }) => {
|
|
||||||
this._onStateChanged(e.state);
|
|
||||||
});
|
|
||||||
this.started = true;
|
|
||||||
console.log('[PhoneCall] Listener aktiv');
|
|
||||||
return true;
|
|
||||||
} catch (err: any) {
|
|
||||||
console.warn('[PhoneCall] start gescheitert:', err?.message || err);
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.started = true;
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
async stop(): Promise<void> {
|
async stop(): Promise<void> {
|
||||||
if (!this.started || !PhoneCall) return;
|
if (!this.started) return;
|
||||||
try {
|
try { this.subscription?.remove(); } catch {}
|
||||||
this.subscription?.remove();
|
try { this.focusSubscription?.remove(); } catch {}
|
||||||
this.subscription = null;
|
this.subscription = null;
|
||||||
await PhoneCall.stop();
|
this.focusSubscription = null;
|
||||||
} catch {}
|
if (PhoneCall) {
|
||||||
|
try { await PhoneCall.stop(); } catch {}
|
||||||
|
}
|
||||||
this.started = false;
|
this.started = false;
|
||||||
this.lastState = 'idle';
|
this.lastState = 'idle';
|
||||||
|
this.interruptedByFocus = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private _onStateChanged(state: PhoneState): void {
|
private _onStateChanged(state: PhoneState): void {
|
||||||
@@ -96,22 +116,106 @@ class PhoneCallService {
|
|||||||
console.log('[PhoneCall] State: %s → %s', prev, state);
|
console.log('[PhoneCall] State: %s → %s', prev, state);
|
||||||
this.lastState = state;
|
this.lastState = state;
|
||||||
if (state === 'ringing' || state === 'offhook') {
|
if (state === 'ringing' || state === 'offhook') {
|
||||||
audioService.haltAllPlayback(`Telefon-State: ${state}`);
|
this._haltForCall(state === 'ringing' ? 'Anruf — ARIA pausiert' : 'Im Gespraech — ARIA pausiert');
|
||||||
// Wake-Word + Aufnahme pausieren: Telefonie-App belegt das Mikro
|
|
||||||
// waehrend des Anrufs, plus ARIA soll nicht im Telefonat zuhoeren.
|
|
||||||
wakeWordService.pauseForCall().catch(() => {});
|
|
||||||
ToastAndroid.show(
|
|
||||||
state === 'ringing' ? 'Anruf — ARIA pausiert' : 'Im Gespraech — ARIA pausiert',
|
|
||||||
ToastAndroid.SHORT,
|
|
||||||
);
|
|
||||||
} else if (state === 'idle' && prev !== 'idle') {
|
} else if (state === 'idle' && prev !== 'idle') {
|
||||||
// Auflegen: Wake-Word reaktivieren wenn vor dem Anruf aktiv war.
|
// Wenn schon durch AudioFocus-Loss pausiert wurde, NICHT doppelt resumen.
|
||||||
// TTS kommt nicht automatisch zurueck (Stream weg) — User kann
|
// Der Focus-Gain-Event triggert das Resume.
|
||||||
// ARIAs letzte Antwort per Play-Button nochmal hoeren.
|
if (!this.interruptedByFocus) {
|
||||||
wakeWordService.resumeFromCall().catch(() => {});
|
this._resumeAfterCall('Anruf beendet — ARIA wieder aktiv');
|
||||||
ToastAndroid.show('Anruf beendet — ARIA wieder aktiv', ToastAndroid.SHORT);
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** AudioFocus-Loss = irgendeine andere App hat den Focus uebernommen.
|
||||||
|
* Das passiert bei VoIP-Anrufen (was wir wollen) ABER auch bei normalen
|
||||||
|
* Audio-Playern (anderer Player startet, Notification-Sound, sogar
|
||||||
|
* unsere eigenen Sound-Calls beim Play-Button). Daher checken wir den
|
||||||
|
* AudioMode — nur IN_CALL (2) oder IN_COMMUNICATION (3) zaehlt als Anruf. */
|
||||||
|
private async _onFocusChanged(type: 'loss' | 'loss_transient' | 'gain'): Promise<void> {
|
||||||
|
if (type === 'loss' || type === 'loss_transient') {
|
||||||
|
// Schon durch klassischen TelephonyManager pausiert? Dann nichts doppeln.
|
||||||
|
if (this.lastState === 'ringing' || this.lastState === 'offhook') return;
|
||||||
|
// Mode pruefen — nur echte Anrufe behandeln.
|
||||||
|
let mode = -1;
|
||||||
|
try { mode = await (NativeModules.AudioFocus as any)?.getMode?.(); } catch {}
|
||||||
|
if (mode !== 2 && mode !== 3) {
|
||||||
|
// NORMAL-Mode → kein Anruf (Stefan hat z.B. Play-Button gedrueckt
|
||||||
|
// oder Spotify hat sich neu reingedraengelt). Keine Toasts.
|
||||||
|
console.log('[PhoneCall] FOCUS_LOSS ignoriert (AudioMode=%d, kein Call)', mode);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.interruptedByFocus = true;
|
||||||
|
this._haltForCall('Anruf erkannt (VoIP) — ARIA pausiert');
|
||||||
|
// Pollen, weil GAIN nicht zuverlaessig kommt (wir releasen den Focus
|
||||||
|
// selbst beim halt → kein automatischer GAIN). AudioMode != IN_COMMUNICATION
|
||||||
|
// = Call vorbei.
|
||||||
|
this._startVoipResumePoll();
|
||||||
|
} else if (type === 'gain') {
|
||||||
|
if (this.interruptedByFocus) {
|
||||||
|
this.interruptedByFocus = false;
|
||||||
|
this._stopVoipResumePoll();
|
||||||
|
this._resumeAfterCall('Audio frei — ARIA wieder aktiv');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Polling-Fallback: alle 3s checken ob AudioMode wieder NORMAL ist. */
|
||||||
|
private voipPollTimer: ReturnType<typeof setInterval> | null = null;
|
||||||
|
private _startVoipResumePoll(): void {
|
||||||
|
if (this.voipPollTimer) return;
|
||||||
|
this.voipPollTimer = setInterval(async () => {
|
||||||
|
if (!this.interruptedByFocus) {
|
||||||
|
this._stopVoipResumePoll();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const mode = await (NativeModules.AudioFocus as any)?.getMode?.();
|
||||||
|
// 0 = MODE_NORMAL — Call ist vorbei
|
||||||
|
if (typeof mode === 'number' && mode === 0) {
|
||||||
|
this.interruptedByFocus = false;
|
||||||
|
this._stopVoipResumePoll();
|
||||||
|
this._resumeAfterCall('Anruf beendet — ARIA wieder aktiv');
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
|
}, 3000);
|
||||||
|
}
|
||||||
|
private _stopVoipResumePoll(): void {
|
||||||
|
if (this.voipPollTimer) {
|
||||||
|
clearInterval(this.voipPollTimer);
|
||||||
|
this.voipPollTimer = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private _haltForCall(toast: string): void {
|
||||||
|
// Position merken bevor wir den Stream killen — fuer Auto-Resume.
|
||||||
|
audioService.captureInterruption();
|
||||||
|
// pauseForCall (statt haltAllPlayback): pcmBuffer + messageId bleiben,
|
||||||
|
// weitere Chunks werden weiter gesammelt damit isFinal die WAV schreibt.
|
||||||
|
audioService.pauseForCall(toast);
|
||||||
|
wakeWordService.pauseForCall().catch(() => {});
|
||||||
|
ToastAndroid.show(toast, ToastAndroid.SHORT);
|
||||||
|
}
|
||||||
|
|
||||||
|
private _resumeAfterCall(toast: string): void {
|
||||||
|
// Anruf-Pause aufheben — neue Chunks duerfen wieder direkt abgespielt
|
||||||
|
// werden (falls die Bridge mid-Anruf isFinal noch nicht geschickt hat).
|
||||||
|
audioService.endCallPause();
|
||||||
|
wakeWordService.resumeFromCall().catch(() => {});
|
||||||
|
ToastAndroid.show(toast, ToastAndroid.SHORT);
|
||||||
|
// 800ms warten bevor Auto-Resume — sonst kollidiert ARIA's neuer Focus-
|
||||||
|
// Request mit Spotify's Auto-Resume nach Anruf-Ende. System haengt nach
|
||||||
|
// dem Auflegen noch im IN_CALL-Mode-Uebergang, Spotify schaut auf Focus-
|
||||||
|
// Gain und wuerde sofort wieder LOSS sehen → bleibt pausiert.
|
||||||
|
// Mit Delay: Spotify resumed kurz, dann pausiert ARIA wieder ordnungs-
|
||||||
|
// gemaess. Wenn ARIA nichts pending hat, bleibt Spotify einfach an.
|
||||||
|
setTimeout(() => {
|
||||||
|
audioService.resumeFromInterruption(30000).then(ok => {
|
||||||
|
if (ok) {
|
||||||
|
console.log('[PhoneCall] Auto-Resume von gemerkter Position gestartet');
|
||||||
|
}
|
||||||
|
}).catch(() => {});
|
||||||
|
}, 800);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const phoneCallService = new PhoneCallService();
|
const phoneCallService = new PhoneCallService();
|
||||||
|
|||||||
@@ -50,28 +50,69 @@ class UpdateService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Raeumt alte heruntergeladene APK-Dateien aus dem Cache auf. */
|
/** Sucht ueberall wo .apk-Dateien herumliegen koennten. */
|
||||||
private async cleanupOldApks(): Promise<void> {
|
private async _apkSearchDirs(): Promise<string[]> {
|
||||||
try {
|
const dirs = [RNFS.CachesDirectoryPath, RNFS.DocumentDirectoryPath];
|
||||||
const files = await RNFS.readDir(RNFS.CachesDirectoryPath);
|
if ((RNFS as any).ExternalCachesDirectoryPath) {
|
||||||
const apks = files.filter(f => /\.apk$/i.test(f.name));
|
dirs.push((RNFS as any).ExternalCachesDirectoryPath);
|
||||||
let freed = 0;
|
|
||||||
for (const f of apks) {
|
|
||||||
try {
|
|
||||||
const size = parseInt(f.size as any, 10) || 0;
|
|
||||||
await RNFS.unlink(f.path);
|
|
||||||
freed += size;
|
|
||||||
console.log(`[Update] Alte APK geloescht: ${f.name} (${(size / 1024 / 1024).toFixed(1)}MB)`);
|
|
||||||
} catch (err: any) {
|
|
||||||
console.warn(`[Update] APK-Loeschen fehlgeschlagen: ${f.name} (${err?.message || err})`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (apks.length > 0) {
|
|
||||||
console.log(`[Update] Cleanup fertig: ${apks.length} APKs entfernt, ${(freed / 1024 / 1024).toFixed(1)}MB freigegeben`);
|
|
||||||
}
|
|
||||||
} catch (err: any) {
|
|
||||||
console.warn(`[Update] Cleanup-Fehler: ${err?.message || err}`);
|
|
||||||
}
|
}
|
||||||
|
if (RNFS.ExternalDirectoryPath) {
|
||||||
|
dirs.push(RNFS.ExternalDirectoryPath);
|
||||||
|
}
|
||||||
|
return dirs;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Raeumt alte heruntergeladene APK-Dateien aus den App-Verzeichnissen auf.
|
||||||
|
* Public damit Settings den Button "Update-Cache leeren" benutzen kann. */
|
||||||
|
async cleanupOldApks(keepCurrentName?: string): Promise<{ removed: number; freedMB: number }> {
|
||||||
|
const dirs = await this._apkSearchDirs();
|
||||||
|
let removed = 0;
|
||||||
|
let freed = 0;
|
||||||
|
for (const dir of dirs) {
|
||||||
|
try {
|
||||||
|
if (!(await RNFS.exists(dir))) continue;
|
||||||
|
const files = await RNFS.readDir(dir);
|
||||||
|
const apks = files.filter(f => /\.apk$/i.test(f.name));
|
||||||
|
for (const f of apks) {
|
||||||
|
if (keepCurrentName && f.name === keepCurrentName) continue;
|
||||||
|
try {
|
||||||
|
const size = parseInt(f.size as any, 10) || 0;
|
||||||
|
await RNFS.unlink(f.path);
|
||||||
|
removed += 1;
|
||||||
|
freed += size;
|
||||||
|
console.log(`[Update] APK geloescht: ${f.path} (${(size / 1024 / 1024).toFixed(1)}MB)`);
|
||||||
|
} catch (err: any) {
|
||||||
|
console.warn(`[Update] APK-Loeschen fehlgeschlagen: ${f.path} (${err?.message || err})`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (err: any) {
|
||||||
|
console.warn(`[Update] Cleanup-Fehler in ${dir}: ${err?.message || err}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const freedMB = freed / 1024 / 1024;
|
||||||
|
if (removed > 0) {
|
||||||
|
console.log(`[Update] Cleanup fertig: ${removed} APK${removed === 1 ? '' : 's'} entfernt, ${freedMB.toFixed(1)}MB freigegeben`);
|
||||||
|
}
|
||||||
|
return { removed, freedMB };
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Aktuelle Groesse aller APK-Dateien in den App-Verzeichnissen (in MB). */
|
||||||
|
async getApkCacheSize(): Promise<{ count: number; totalMB: number }> {
|
||||||
|
const dirs = await this._apkSearchDirs();
|
||||||
|
let count = 0;
|
||||||
|
let total = 0;
|
||||||
|
for (const dir of dirs) {
|
||||||
|
try {
|
||||||
|
if (!(await RNFS.exists(dir))) continue;
|
||||||
|
const files = await RNFS.readDir(dir);
|
||||||
|
for (const f of files) {
|
||||||
|
if (!f.isFile() || !/\.apk$/i.test(f.name)) continue;
|
||||||
|
count += 1;
|
||||||
|
total += parseInt(f.size as any, 10) || 0;
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
return { count, totalMB: total / 1024 / 1024 };
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Bei App-Start Update pruefen */
|
/** Bei App-Start Update pruefen */
|
||||||
|
|||||||
+59
-4
@@ -677,7 +677,10 @@ class ARIABridge:
|
|||||||
while self.running:
|
while self.running:
|
||||||
try:
|
try:
|
||||||
logger.info("[core] Verbinde: %s", self.ws_url)
|
logger.info("[core] Verbinde: %s", self.ws_url)
|
||||||
async with websockets.connect(self.ws_url) as ws:
|
# max_size=50MB damit grosse Bilder/Voice-Uploads durchgehen.
|
||||||
|
# Python-websockets Default ist nur 1 MiB → 5MB JPEG sprengt
|
||||||
|
# das Limit, Connection wird silent gedroppt.
|
||||||
|
async with websockets.connect(self.ws_url, max_size=50 * 1024 * 1024) as ws:
|
||||||
# OpenClaw Handshake durchfuehren
|
# OpenClaw Handshake durchfuehren
|
||||||
if not await self._openclaw_handshake(ws):
|
if not await self._openclaw_handshake(ws):
|
||||||
logger.error("[core] Handshake fehlgeschlagen — Reconnect")
|
logger.error("[core] Handshake fehlgeschlagen — Reconnect")
|
||||||
@@ -783,13 +786,29 @@ class ARIABridge:
|
|||||||
await self._emit_activity("idle", "")
|
await self._emit_activity("idle", "")
|
||||||
if not text:
|
if not text:
|
||||||
logger.warning("[core] chat final ohne Text: %s", json.dumps(payload)[:200])
|
logger.warning("[core] chat final ohne Text: %s", json.dumps(payload)[:200])
|
||||||
|
# App+Diagnostic informieren statt stumm — sonst wartet die
|
||||||
|
# UI ewig auf eine Antwort die nicht kommt. Passiert z.B.
|
||||||
|
# wenn Claude-Vision das Bild ablehnt (leere Antwort)
|
||||||
|
# oder die Antwort nur aus Tool-Calls ohne Final-Text bestand.
|
||||||
|
await self._send_to_rvs({
|
||||||
|
"type": "chat",
|
||||||
|
"payload": {
|
||||||
|
"text": "[Hinweis] Antwort ohne Text — moeglicherweise Bild zu gross fuer Vision-API oder reine Tool-Ausfuehrung.",
|
||||||
|
"sender": "aria",
|
||||||
|
},
|
||||||
|
"timestamp": int(asyncio.get_event_loop().time() * 1000),
|
||||||
|
})
|
||||||
return
|
return
|
||||||
logger.info("[core] Antwort: '%s'", text[:80])
|
logger.info("[core] Antwort: '%s'", text[:80])
|
||||||
await self._process_core_response(text, payload)
|
await self._process_core_response(text, payload)
|
||||||
return
|
return
|
||||||
|
|
||||||
if state == "error":
|
if state == "error":
|
||||||
error = payload.get("error", "Unbekannt")
|
# OpenClaw nutzt errorMessage statt error bei state=error.
|
||||||
|
error = (payload.get("error")
|
||||||
|
or payload.get("errorMessage")
|
||||||
|
or payload.get("message")
|
||||||
|
or "Unbekannt")
|
||||||
logger.error("[core] Chat-Fehler: %s", error)
|
logger.error("[core] Chat-Fehler: %s", error)
|
||||||
self._last_chat_final_at = asyncio.get_event_loop().time()
|
self._last_chat_final_at = asyncio.get_event_loop().time()
|
||||||
await self._emit_activity("idle", "")
|
await self._emit_activity("idle", "")
|
||||||
@@ -825,7 +844,12 @@ class ARIABridge:
|
|||||||
return
|
return
|
||||||
|
|
||||||
if event_name == "chat:error":
|
if event_name == "chat:error":
|
||||||
error = payload.get("error", payload.get("message", "Unbekannt"))
|
# OpenClaw legt den echten Text manchmal in errorMessage ab
|
||||||
|
# (state=error). Vorher wurde nur error/message gechecked → "Unbekannt".
|
||||||
|
error = (payload.get("error")
|
||||||
|
or payload.get("errorMessage")
|
||||||
|
or payload.get("message")
|
||||||
|
or "Unbekannt")
|
||||||
logger.error("[core] Chat-Fehler (legacy): %s", error)
|
logger.error("[core] Chat-Fehler (legacy): %s", error)
|
||||||
await self._send_to_rvs({
|
await self._send_to_rvs({
|
||||||
"type": "chat",
|
"type": "chat",
|
||||||
@@ -1141,7 +1165,8 @@ class ARIABridge:
|
|||||||
try:
|
try:
|
||||||
url = f"{current_url}?token={self.rvs_token}"
|
url = f"{current_url}?token={self.rvs_token}"
|
||||||
logger.info("[rvs] Verbinde: %s", current_url)
|
logger.info("[rvs] Verbinde: %s", current_url)
|
||||||
async with websockets.connect(url) as ws:
|
# max_size=50MB (siehe core-Connect oben — gleicher Grund).
|
||||||
|
async with websockets.connect(url, max_size=50 * 1024 * 1024) as ws:
|
||||||
self.ws_rvs = ws
|
self.ws_rvs = ws
|
||||||
retry_delay = 2
|
retry_delay = 2
|
||||||
logger.info("[rvs] Verbunden — warte auf App-Nachrichten")
|
logger.info("[rvs] Verbunden — warte auf App-Nachrichten")
|
||||||
@@ -1461,6 +1486,31 @@ class ARIABridge:
|
|||||||
size_kb = len(file_b64) // 1365
|
size_kb = len(file_b64) // 1365
|
||||||
logger.info("[rvs] Datei gespeichert: %s (%dKB)", file_path, size_kb)
|
logger.info("[rvs] Datei gespeichert: %s (%dKB)", file_path, size_kb)
|
||||||
|
|
||||||
|
# Pixel-Bilder fuer Claude-Vision shrinken wenn > 2 MB. SVG/PDF/ZIP
|
||||||
|
# bleiben unangetastet (Vision laeuft eh nur auf Raster-Formaten).
|
||||||
|
CLAUDE_VISION_FORMATS = ("image/jpeg", "image/jpg", "image/png", "image/webp", "image/gif")
|
||||||
|
if file_type.lower() in CLAUDE_VISION_FORMATS:
|
||||||
|
file_size_bytes = os.path.getsize(file_path)
|
||||||
|
if file_size_bytes > 2 * 1024 * 1024:
|
||||||
|
try:
|
||||||
|
from PIL import Image
|
||||||
|
with Image.open(file_path) as img:
|
||||||
|
orig_w, orig_h = img.size
|
||||||
|
# Anthropic-Empfehlung: max 1568px lange Seite. RGB-Konvertierung
|
||||||
|
# falls RGBA/Palette (JPEG braucht RGB).
|
||||||
|
img.thumbnail((1568, 1568), Image.Resampling.LANCZOS)
|
||||||
|
if img.mode in ("RGBA", "P"):
|
||||||
|
img = img.convert("RGB")
|
||||||
|
img.save(file_path, "JPEG", quality=85, optimize=True)
|
||||||
|
new_size_bytes = os.path.getsize(file_path)
|
||||||
|
logger.info("[rvs] Bild verkleinert: %dx%d → %dx%d, %.1fMB → %.1fMB",
|
||||||
|
orig_w, orig_h, img.size[0], img.size[1],
|
||||||
|
file_size_bytes / 1024 / 1024,
|
||||||
|
new_size_bytes / 1024 / 1024)
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning("[rvs] Bild-Resize fehlgeschlagen (%s) — Original wird genutzt: %s",
|
||||||
|
file_name, e)
|
||||||
|
|
||||||
# In Pending-Queue + Flush-Timer (anti-spam Buffering)
|
# In Pending-Queue + Flush-Timer (anti-spam Buffering)
|
||||||
self._pending_files.append((file_path, file_name, file_type, size_kb, int(width or 0), int(height or 0)))
|
self._pending_files.append((file_path, file_name, file_type, size_kb, int(width or 0), int(height or 0)))
|
||||||
if self._pending_files_flush_task and not self._pending_files_flush_task.done():
|
if self._pending_files_flush_task and not self._pending_files_flush_task.done():
|
||||||
@@ -1634,6 +1684,11 @@ class ARIABridge:
|
|||||||
}
|
}
|
||||||
if audio_request_id:
|
if audio_request_id:
|
||||||
stt_payload["audioRequestId"] = audio_request_id
|
stt_payload["audioRequestId"] = audio_request_id
|
||||||
|
# GPS aus dem Original-Audio-Payload mitgeben — Diagnostic
|
||||||
|
# zeigt sie sonst nicht an (App sendet location nur einmal,
|
||||||
|
# die im audio-Payload). Reine Anzeige-Information.
|
||||||
|
if location:
|
||||||
|
stt_payload["location"] = location
|
||||||
ok = await self._send_to_rvs({
|
ok = await self._send_to_rvs({
|
||||||
"type": "chat",
|
"type": "chat",
|
||||||
"payload": stt_payload,
|
"payload": stt_payload,
|
||||||
|
|||||||
@@ -16,3 +16,6 @@ sounddevice
|
|||||||
|
|
||||||
# Wake-Word Erkennung
|
# Wake-Word Erkennung
|
||||||
openwakeword
|
openwakeword
|
||||||
|
|
||||||
|
# Bild-Resizing (zu grosse Pixel-Bilder shrinken bevor Claude-Vision sie sieht — 5MB-Limit)
|
||||||
|
Pillow
|
||||||
|
|||||||
+29
-2
@@ -278,6 +278,10 @@
|
|||||||
<input type="checkbox" id="tts-debug-toggle" onchange="toggleTtsDebug()" style="margin-right:4px;vertical-align:middle;">
|
<input type="checkbox" id="tts-debug-toggle" onchange="toggleTtsDebug()" style="margin-right:4px;vertical-align:middle;">
|
||||||
TTS-Text einblenden
|
TTS-Text einblenden
|
||||||
</label>
|
</label>
|
||||||
|
<label style="color:#8888AA;font-size:11px;cursor:pointer;">
|
||||||
|
<input type="checkbox" id="gps-debug-toggle" onchange="toggleGpsDebug()" style="margin-right:4px;vertical-align:middle;">
|
||||||
|
GPS-Position einblenden
|
||||||
|
</label>
|
||||||
<button class="btn secondary" onclick="toggleChatFullscreen()" id="btn-chat-fs" style="padding:4px 10px;font-size:11px;">Vollbild</button>
|
<button class="btn secondary" onclick="toggleChatFullscreen()" id="btn-chat-fs" style="padding:4px 10px;font-size:11px;">Vollbild</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -1004,7 +1008,7 @@
|
|||||||
if (sender === 'aria') return;
|
if (sender === 'aria') return;
|
||||||
const chatType = 'sent';
|
const chatType = 'sent';
|
||||||
const label = sender === 'stt' ? '\uD83C\uDFA4 Spracheingabe' : `via RVS (${sender})`;
|
const label = sender === 'stt' ? '\uD83C\uDFA4 Spracheingabe' : `via RVS (${sender})`;
|
||||||
addChat(chatType, p.text || '?', label);
|
addChat(chatType, p.text || '?', label, { location: p.location });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (msg.type === 'proxy_result') {
|
if (msg.type === 'proxy_result') {
|
||||||
@@ -1395,6 +1399,16 @@
|
|||||||
if (el) el.checked = showTtsDebug;
|
if (el) el.checked = showTtsDebug;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Debug-Toggle: GPS-Position unter User-Nachrichten einblenden (nur Diagnostic).
|
||||||
|
// App zeigt's bewusst nicht — die Position geht nur an aria-core.
|
||||||
|
let showGpsDebug = localStorage.getItem('aria-show-gps-debug') === '1';
|
||||||
|
function toggleGpsDebug() {
|
||||||
|
showGpsDebug = !showGpsDebug;
|
||||||
|
localStorage.setItem('aria-show-gps-debug', showGpsDebug ? '1' : '0');
|
||||||
|
const el = document.getElementById('gps-debug-toggle');
|
||||||
|
if (el) el.checked = showGpsDebug;
|
||||||
|
}
|
||||||
|
|
||||||
// Minimal-JS-Port von clean_text_for_tts() (Bridge) — reine Anzeige
|
// Minimal-JS-Port von clean_text_for_tts() (Bridge) — reine Anzeige
|
||||||
function previewTtsText(text) {
|
function previewTtsText(text) {
|
||||||
if (!text) return '';
|
if (!text) return '';
|
||||||
@@ -1434,7 +1448,18 @@
|
|||||||
ttsBlock = `<div style="margin-top:6px;padding:4px 8px;background:rgba(0,150,255,0.08);border-left:2px solid #0096FF;font-size:11px;color:#88AACC;"><span style="color:#0096FF;font-weight:bold;">TTS:</span> ${escapeHtml(ttsText)}</div>`;
|
ttsBlock = `<div style="margin-top:6px;padding:4px 8px;background:rgba(0,150,255,0.08);border-left:2px solid #0096FF;font-size:11px;color:#88AACC;"><span style="color:#0096FF;font-weight:bold;">TTS:</span> ${escapeHtml(ttsText)}</div>`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const html = `${linked}${ttsBlock}<div class="meta">${escapeHtml(meta)} — ${new Date().toLocaleTimeString('de-DE')}</div>`;
|
// Optional: GPS-Position als Block unter User-Nachrichten (nur Diagnostic)
|
||||||
|
let gpsBlock = '';
|
||||||
|
if (showGpsDebug && options && options.location) {
|
||||||
|
const loc = options.location;
|
||||||
|
const lat = typeof loc.lat === 'number' ? loc.lat.toFixed(6) : '?';
|
||||||
|
const lon = typeof loc.lon === 'number' ? loc.lon.toFixed(6) : (typeof loc.lng === 'number' ? loc.lng.toFixed(6) : '?');
|
||||||
|
if (lat !== '?' && lon !== '?') {
|
||||||
|
const mapLink = `https://www.openstreetmap.org/?mlat=${lat}&mlon=${lon}#map=16/${lat}/${lon}`;
|
||||||
|
gpsBlock = `<div style="margin-top:6px;padding:4px 8px;background:rgba(52,199,89,0.08);border-left:2px solid #34C759;font-size:11px;color:#88BB99;"><span style="color:#34C759;font-weight:bold;">📍 GPS:</span> <a href="${mapLink}" target="_blank" rel="noopener" style="color:#88BB99;text-decoration:underline;">${lat}, ${lon}</a></div>`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const html = `${linked}${ttsBlock}${gpsBlock}<div class="meta">${escapeHtml(meta)} — ${new Date().toLocaleTimeString('de-DE')}</div>`;
|
||||||
|
|
||||||
// Thinking-Indikator ausblenden bei neuer Nachricht
|
// Thinking-Indikator ausblenden bei neuer Nachricht
|
||||||
updateThinkingIndicator({ activity: 'idle' });
|
updateThinkingIndicator({ activity: 'idle' });
|
||||||
@@ -2451,6 +2476,8 @@
|
|||||||
// Toggle-Checkbox initial korrekt setzen
|
// Toggle-Checkbox initial korrekt setzen
|
||||||
const ttsToggleEl = document.getElementById('tts-debug-toggle');
|
const ttsToggleEl = document.getElementById('tts-debug-toggle');
|
||||||
if (ttsToggleEl) ttsToggleEl.checked = showTtsDebug;
|
if (ttsToggleEl) ttsToggleEl.checked = showTtsDebug;
|
||||||
|
const gpsToggleEl = document.getElementById('gps-debug-toggle');
|
||||||
|
if (gpsToggleEl) gpsToggleEl.checked = showGpsDebug;
|
||||||
|
|
||||||
// Disk-Space Banner aktualisieren (wird vom Server via disk_status gepusht)
|
// Disk-Space Banner aktualisieren (wird vom Server via disk_status gepusht)
|
||||||
function updateDiskBanner(status) {
|
function updateDiskBanner(status) {
|
||||||
|
|||||||
@@ -1,5 +1,56 @@
|
|||||||
# ARIA Issues & Features
|
# ARIA Issues & Features
|
||||||
|
|
||||||
|
## Audio-Verhalten in der App
|
||||||
|
|
||||||
|
So sollte die App in den verschiedenen Phasen mit fremden Audio-Apps
|
||||||
|
(Spotify, YouTube, Podcasts etc.) und dem eigenen Mikro umgehen.
|
||||||
|
Wenn was anders ist, ist's ein Bug.
|
||||||
|
|
||||||
|
| Phase | Andere App (Spotify) | ARIA-Mikro | Hintergrund-Service |
|
||||||
|
|------------------------------|----------------------|---------------------|---------------------|
|
||||||
|
| Idle / Ohr aus | spielt frei | aus | aus |
|
||||||
|
| Wake-Word lauscht (armed) | spielt frei | passiv (openWakeWord) | aktiv ('wake') |
|
||||||
|
| User-Aufnahme laeuft | pausiert (EXCLUSIVE) | Recording | aktiv ('rec') |
|
||||||
|
| Aufnahme zu Ende | resumed | aus | (rec released) |
|
||||||
|
| ARIA denkt/schreibt (~20s) | spielt frei | aus | (kein Slot) |
|
||||||
|
| TTS startet | pausiert (DUCK) | aus (oder barge) | aktiv ('tts') |
|
||||||
|
| TTS spielt (auch GPU-Pausen) | bleibt pausiert | barge wenn Wake-Word| aktiv |
|
||||||
|
| TTS zu Ende | nach 800ms resumed | (Conversation-Window)| (tts released) |
|
||||||
|
| Eingehender Anruf (auch VoIP)| — | Mikro pausiert | aus |
|
||||||
|
| Anruf vorbei | — | Mikro wieder armed | aktiv ('wake') |
|
||||||
|
| Anruf vorbei (Auto-Resume) | pausiert wieder | aus | aktiv ('tts') |
|
||||||
|
| Neue Frage waehrend Anruf | — | Mikro pausiert | (rec waehrend Anruf nicht) |
|
||||||
|
| Anruf vorbei nach neuer Frage | (siehe TTS-Phasen) | (siehe TTS-Phasen) | (tts gewinnt, alter Resume verworfen) |
|
||||||
|
|
||||||
|
Wichtige Mechanismen:
|
||||||
|
- **Underrun-Schutz** im PcmStreamPlayer fuettert Stille rein wenn die
|
||||||
|
Bridge in Render-Pausen liefert — Spotify bleibt durchgehend pausiert,
|
||||||
|
auch zwischen den Saetzen einer langen Antwort.
|
||||||
|
- **Conversation-Focus** (nur bei Wake-Word 'conversing') haelt den
|
||||||
|
AudioFocus dauerhaft. Bei reinem Tap-to-Talk oder Text-Chat greift's
|
||||||
|
nicht — Spotify darf in der Denk-Phase ruhig weiterspielen.
|
||||||
|
- **Foreground-Service** (mediaPlayback|microphone) haelt App-Prozess
|
||||||
|
am Leben damit TTS/Mikro/Wake-Word auch bei minimierter App weiter-
|
||||||
|
laufen. Notification zeigt aktuellen Status ("ARIA spricht/hoert
|
||||||
|
zu/bereit").
|
||||||
|
- **Anruf-Erkennung** ueber TelephonyManager (klassisch) + AudioFocus-
|
||||||
|
Loss-Listener mit Polling-Fallback (VoIP wie WhatsApp/Signal/Discord).
|
||||||
|
- **Auto-Resume nach Anruf**: beim Halt wird die Wiedergabe-Position
|
||||||
|
gemerkt (Date.now() - playbackStart - leadingSilence). Nach Auflegen
|
||||||
|
wartet die App bis zu 30s auf den WAV-Cache und spielt dann ab der
|
||||||
|
gemerkten Position weiter. Wenn das Telefonat länger als die Antwort
|
||||||
|
dauerte, ist der Cache schon fertig — instant Resume.
|
||||||
|
- **Neue Frage waehrend Anruf** (Text-Chat geht trotz Telefonat): die
|
||||||
|
neue Antwort ueberschreibt den pending Resume. _handlePcmChunkImpl
|
||||||
|
stoppt einen ggf. laufenden resumeSound und setzt pausedMessageId
|
||||||
|
zurueck wenn die neue Stream-messageId abweicht. Die letzte Antwort
|
||||||
|
gewinnt immer.
|
||||||
|
- **Audio-Ausgabe trotz aktivem Telefonat**: ARIA antwortet auch waehrend
|
||||||
|
eines Telefonats per Lautsprecher (Telefon-Audio geht ueber separaten
|
||||||
|
Stream zur Gegenseite). haltAllPlayback wird nur beim STATE-WECHSEL
|
||||||
|
ringing/offhook gerufen — wenn der Anruf schon laeuft (offhook→offhook),
|
||||||
|
triggert eine neue Frage keinen Halt mehr.
|
||||||
|
|
||||||
## Erledigt
|
## Erledigt
|
||||||
|
|
||||||
### Bugs / Fixes
|
### Bugs / Fixes
|
||||||
@@ -34,6 +85,10 @@
|
|||||||
- [x] **App-Resume-Cooldown**: Wechsel von Background → Foreground triggert keinen falschen Wake-Word-Trigger mehr. AppState-Listener setzt 1.5s Cooldown in dem onWakeDetected-Events ignoriert werden (Audio-Pegel-Spike beim AudioFocus-Switch sonst als Wake-Word interpretiert)
|
- [x] **App-Resume-Cooldown**: Wechsel von Background → Foreground triggert keinen falschen Wake-Word-Trigger mehr. AppState-Listener setzt 1.5s Cooldown in dem onWakeDetected-Events ignoriert werden (Audio-Pegel-Spike beim AudioFocus-Switch sonst als Wake-Word interpretiert)
|
||||||
- [x] Background-Mikro robust: acquireBackgroundAudio('rec'/'wake') wird jetzt VOR AudioRecord.startRecording gerufen — Foreground-Service mit foregroundServiceType=microphone muss aktiv sein bevor das Mikro greift, sonst blockiert Android ab 11+ den Background-Zugriff
|
- [x] Background-Mikro robust: acquireBackgroundAudio('rec'/'wake') wird jetzt VOR AudioRecord.startRecording gerufen — Foreground-Service mit foregroundServiceType=microphone muss aktiv sein bevor das Mikro greift, sonst blockiert Android ab 11+ den Background-Zugriff
|
||||||
- [x] **Stille-Pegel manuell setzbar** (Settings → Spracheingabe): Override-Wert in dB von -55 bis -15, default "automatisch". Info-Button mit Modal erklaert die Skala (niedriger = sensibler, hoeher = robuster gegen Hintergrundlaerm). Bei manuell gesetztem Wert wird die adaptive Baseline ignoriert
|
- [x] **Stille-Pegel manuell setzbar** (Settings → Spracheingabe): Override-Wert in dB von -55 bis -15, default "automatisch". Info-Button mit Modal erklaert die Skala (niedriger = sensibler, hoeher = robuster gegen Hintergrundlaerm). Bei manuell gesetztem Wert wird die adaptive Baseline ignoriert
|
||||||
|
- [x] **Kurze TTS-Texte (1-3 Worte) spielen jetzt ab** — auf OnePlus A12 stallte AudioTrack mit `pos=0` weil der Default-Start-Threshold `bufferSize/2` (= 2s) bei kurzen Streams nie ueberschritten wurde. Fix: `setStartThresholdInFrames(100ms)` direkt nach dem Track-Build (API 31+). Buffer auf 4s entkoppelt von Pre-Roll, `play()` wird beim allerersten data-chunk gerufen
|
||||||
|
- [x] **Mute-Button stoppt jetzt auch laufenden PCM-Stream** — `pcmStreamActive` wurde beim isFinal-Chunk schon false gesetzt, der AudioTrack spielte aber noch sekundenlang aus seinem Buffer. `stopPlayback()` uebersprang darum `PcmStreamPlayer.stop()`. Fix: stop() immer rufen (ist idempotent), kein Flag-Check mehr
|
||||||
|
- [x] **GPS-Permission im Manifest + Runtime-Request** beim Settings-Toggle — vorher fehlten ACCESS_COARSE_LOCATION / ACCESS_FINE_LOCATION komplett. `Geolocation.getCurrentPosition` schlug lautlos fehl, App sendete nie ein location-Feld
|
||||||
|
- [x] **GPS-Position auch im STT-Payload an Diagnostic** — die App sendet location einmal im audio-Payload. Die Bridge nutzte sie zwar (ging in aria-core's Kontext rein), reichte sie aber nicht im STT-broadcast an Diagnostic durch. Diagnostic zeigte darum bei Spracheingaben nie den GPS-Block, obwohl der "GPS einblenden"-Toggle aktiv war
|
||||||
|
|
||||||
### App Features
|
### App Features
|
||||||
|
|
||||||
@@ -108,6 +163,12 @@
|
|||||||
- [x] **Wake-Word komplett on-device via openWakeWord (ONNX Runtime)** — Porcupine raus, kein API-Key/keine Lizenzgebuehren mehr. Mitgelieferte Keywords: hey_jarvis, computer, alexa, hey_mycroft, hey_rhasspy
|
- [x] **Wake-Word komplett on-device via openWakeWord (ONNX Runtime)** — Porcupine raus, kein API-Key/keine Lizenzgebuehren mehr. Mitgelieferte Keywords: hey_jarvis, computer, alexa, hey_mycroft, hey_rhasspy
|
||||||
- [x] APK ABI-Split auf arm64-v8a — von ~136 MB auf ~35 MB, Auto-Update-Downloads aufs Phone deutlich kleiner
|
- [x] APK ABI-Split auf arm64-v8a — von ~136 MB auf ~35 MB, Auto-Update-Downloads aufs Phone deutlich kleiner
|
||||||
- [x] PhoneStateListener: TTS pausiert bei eingehendem Anruf (READ_PHONE_STATE Permission)
|
- [x] PhoneStateListener: TTS pausiert bei eingehendem Anruf (READ_PHONE_STATE Permission)
|
||||||
|
- [x] **VoIP-Anrufe** (WhatsApp/Signal/Discord/Teams) erkannt via AudioFocus-Loss-Listener + getMode-Polling-Fallback (alle 3s)
|
||||||
|
- [x] **Auto-Resume nach Anruf**: ARIAs unterbrochene Antwort spielt nach dem Auflegen ab der gemerkten Position weiter (Date.now()-Tracking + WAV-Cache, 30s-Wartezeit auf final-Marker bei kurzem Telefonat)
|
||||||
|
- [x] **Neue Frage waehrend Telefonat** ueberschreibt pending Auto-Resume — letzte Antwort gewinnt, alter resumeSound wird gestoppt
|
||||||
|
- [x] **Audio-Ausgabe waehrend aktivem Telefonat** funktioniert (haltAllPlayback nur bei state-Wechsel idle→ringing/offhook, nicht bei offhook→offhook)
|
||||||
|
- [x] **PcmPlaybackFinished-Event** im Native: AudioFocus wird erst released wenn AudioTrack wirklich durch ist (vorher: end()-Cap nach 0.5s → Spotify spielte 32s parallel zu ARIA)
|
||||||
|
- [x] **APK-Cache-Cleanup robuster**: durchsucht jetzt CachesDirectoryPath + DocumentDirectoryPath + ExternalCachesDirectoryPath + ExternalDirectoryPath statt nur Caches. Plus manueller Button "Update-Cache leeren" in Settings → Speicher mit Live-Anzeige der aktuellen Groesse
|
||||||
- [x] Diagnostic-Chat: bubblige Formatierung, mehrzeiliges Eingabefeld (textarea, Enter sendet, Shift+Enter neue Zeile)
|
- [x] Diagnostic-Chat: bubblige Formatierung, mehrzeiliges Eingabefeld (textarea, Enter sendet, Shift+Enter neue Zeile)
|
||||||
- [x] Adaptive VAD-Schwelle: Baseline aus den ersten 500ms Mic-Pegel, Stille = baseline+6dB / Sprache = baseline+12dB
|
- [x] Adaptive VAD-Schwelle: Baseline aus den ersten 500ms Mic-Pegel, Stille = baseline+6dB / Sprache = baseline+12dB
|
||||||
- [x] Max-Aufnahmedauer konfigurierbar in Settings (1-30 min, Default 5 min) — laengere Diktate moeglich
|
- [x] Max-Aufnahmedauer konfigurierbar in Settings (1-30 min, Default 5 min) — laengere Diktate moeglich
|
||||||
@@ -132,7 +193,6 @@
|
|||||||
### App Features
|
### App Features
|
||||||
- [ ] Chat-History zuverlaessiger laden (AsyncStorage Race Condition)
|
- [ ] Chat-History zuverlaessiger laden (AsyncStorage Race Condition)
|
||||||
- [ ] Custom-Wake-Word-Upload via Diagnostic (eigene .onnx-Files ohne App-Rebuild)
|
- [ ] Custom-Wake-Word-Upload via Diagnostic (eigene .onnx-Files ohne App-Rebuild)
|
||||||
- [ ] Pause+Resume bei Anruf: aktuell wird der TTS-Stream bei Klingeln hart gestoppt, schoener waere Pause + Resume nach Auflegen
|
|
||||||
|
|
||||||
### Architektur
|
### Architektur
|
||||||
- [ ] Bilder: Claude Vision direkt nutzen (aktuell nur Dateipfad an ARIA)
|
- [ ] Bilder: Claude Vision direkt nutzen (aktuell nur Dateipfad an ARIA)
|
||||||
|
|||||||
Reference in New Issue
Block a user