Compare commits
24 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| bbbe69d928 | |||
| 23c39d5bba | |||
| 5328dc8595 | |||
| 0c03b4f161 | |||
| 31fe70bab5 | |||
| 39251b3d32 | |||
| 0623de32a0 | |||
| cd5e6e7ee6 | |||
| ee3e0a0af6 | |||
| 0783b1b99d | |||
| 5492c7a46f | |||
| 4cbe184faa | |||
| 647a1cb726 | |||
| 73263b69a6 | |||
| c62ceafdc2 | |||
| 9b5a35cb4a | |||
| 5ac1a0a522 | |||
| a28b46a809 | |||
| 59c8d36a3d | |||
| 79ba7b8487 | |||
| ba62cec78c | |||
| f15b3f583f | |||
| 402bddc18a | |||
| 350069d371 |
@@ -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 402
|
versionCode 407
|
||||||
versionName "0.0.4.2"
|
versionName "0.0.4.7"
|
||||||
// Fallback fuer Libraries mit Product Flavors
|
// Fallback fuer Libraries mit Product Flavors
|
||||||
missingDimensionStrategy 'react-native-camera', 'general'
|
missingDimensionStrategy 'react-native-camera', 'general'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,22 +13,29 @@ import com.facebook.react.bridge.ReactMethod
|
|||||||
import java.util.concurrent.LinkedBlockingQueue
|
import java.util.concurrent.LinkedBlockingQueue
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Streamt PCM-s16le Audio direkt via AudioTrack MODE_STREAM.
|
* Streamt PCM-s16le Audio direkt via AudioTrack MODE_STREAM mit Pre-Roll.
|
||||||
|
*
|
||||||
|
* Pre-Roll: AudioTrack wird zwar direkt gebaut und gefuttert, aber play()
|
||||||
|
* wird erst aufgerufen wenn PREROLL_SECONDS Audio im Buffer ist. So hat
|
||||||
|
* der Stream Zeit einen Vorrat aufzubauen — wenn XTTS mit RTF>1 rendert
|
||||||
|
* (langsamer als Echtzeit), laeuft der Buffer trotzdem nicht leer.
|
||||||
*
|
*
|
||||||
* Flow:
|
* Flow:
|
||||||
* JS: start(sampleRate, channels) → öffnet AudioTrack und startet Writer-Thread
|
* JS: start(sampleRate, channels) → öffnet AudioTrack (noch nicht play())
|
||||||
* JS: writeChunk(base64) → dekodiert, queued, Writer schreibt non-blocking
|
* JS: writeChunk(base64) → dekodiert, queued, Writer schreibt
|
||||||
* JS: end() → wartet bis Queue leer, schließt AudioTrack
|
* Writer: spielt los sobald PREROLL erreicht ist
|
||||||
* JS: stop() → Hart stoppen, Queue leeren (Cancel)
|
* JS: end() → wartet bis Queue leer, schließt
|
||||||
*
|
* JS: stop() → Hart stoppen (Cancel)
|
||||||
* Vorteil gegenüber Sound-File-Queue:
|
|
||||||
* - Keine Gap zwischen Chunks (AudioTrack puffert intern)
|
|
||||||
* - Erste Samples beginnen zu spielen sobald der erste Chunk da ist
|
|
||||||
* - Kein WAV-Header-Parsing pro Chunk
|
|
||||||
*/
|
*/
|
||||||
class PcmStreamPlayerModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
|
class PcmStreamPlayerModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
|
||||||
companion object {
|
companion object {
|
||||||
private const val TAG = "PcmStreamPlayer"
|
private const val TAG = "PcmStreamPlayer"
|
||||||
|
// Sekunden Audio die VOR play()-Start gepuffert sein muessen.
|
||||||
|
// 2.5s Vorrat = genug um XTTS-Render-Pausen zwischen Chunks zu puffern.
|
||||||
|
private const val PREROLL_SECONDS = 2.5
|
||||||
|
// Stille am Stream-Anfang, damit AudioTrack sauber anfaehrt und die
|
||||||
|
// ersten Samples nicht abgeschnitten werden (XTTS-Warmup + play()-Latenz).
|
||||||
|
private const val LEADING_SILENCE_SECONDS = 0.2
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getName() = "PcmStreamPlayer"
|
override fun getName() = "PcmStreamPlayer"
|
||||||
@@ -38,6 +45,10 @@ class PcmStreamPlayerModule(reactContext: ReactApplicationContext) : ReactContex
|
|||||||
private var writerThread: Thread? = null
|
private var writerThread: Thread? = null
|
||||||
@Volatile private var writerShouldStop = false
|
@Volatile private var writerShouldStop = false
|
||||||
@Volatile private var endRequested = false
|
@Volatile private var endRequested = false
|
||||||
|
@Volatile private var prerollBytes: Int = 0
|
||||||
|
@Volatile private var playbackStarted = false
|
||||||
|
@Volatile private var bytesBuffered: Long = 0
|
||||||
|
@Volatile private var streamBytesPerFrame: Int = 2 // mono s16le default
|
||||||
|
|
||||||
// ── Lifecycle ──
|
// ── Lifecycle ──
|
||||||
|
|
||||||
@@ -50,8 +61,14 @@ class PcmStreamPlayerModule(reactContext: ReactApplicationContext) : ReactContex
|
|||||||
val channelConfig = if (channels == 2) AudioFormat.CHANNEL_OUT_STEREO else AudioFormat.CHANNEL_OUT_MONO
|
val channelConfig = if (channels == 2) AudioFormat.CHANNEL_OUT_STEREO else AudioFormat.CHANNEL_OUT_MONO
|
||||||
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)
|
||||||
// Etwas grosszuegiger Buffer: 8x MinSize (ca. 200-400ms bei 24kHz) — glatt auch bei kleinen Netzwerk-Aussetzern
|
val bytesPerSecond = sampleRate * channels * 2 // 16-bit = 2 bytes
|
||||||
val bufferSize = (minBuf * 8).coerceAtLeast(32 * 1024)
|
// Buffer muss mindestens PREROLL + etwas Spielraum fassen.
|
||||||
|
val prerollTarget = (bytesPerSecond * PREROLL_SECONDS).toInt()
|
||||||
|
val bufferSize = (minBuf * 32).coerceAtLeast(prerollTarget * 2)
|
||||||
|
prerollBytes = prerollTarget
|
||||||
|
bytesBuffered = 0
|
||||||
|
playbackStarted = false
|
||||||
|
streamBytesPerFrame = channels * 2 // s16 = 2 bytes per sample
|
||||||
|
|
||||||
val newTrack = AudioTrack.Builder()
|
val newTrack = AudioTrack.Builder()
|
||||||
.setAudioAttributes(
|
.setAudioAttributes(
|
||||||
@@ -71,7 +88,7 @@ class PcmStreamPlayerModule(reactContext: ReactApplicationContext) : ReactContex
|
|||||||
.setTransferMode(AudioTrack.MODE_STREAM)
|
.setTransferMode(AudioTrack.MODE_STREAM)
|
||||||
.build()
|
.build()
|
||||||
|
|
||||||
newTrack.play()
|
// AudioTrack erstellen — play() wird erst aufgerufen wenn Pre-Roll erreicht.
|
||||||
track = newTrack
|
track = newTrack
|
||||||
queue.clear()
|
queue.clear()
|
||||||
writerShouldStop = false
|
writerShouldStop = false
|
||||||
@@ -80,27 +97,83 @@ class PcmStreamPlayerModule(reactContext: ReactApplicationContext) : ReactContex
|
|||||||
writerThread = Thread({
|
writerThread = Thread({
|
||||||
val t = track ?: return@Thread
|
val t = track ?: return@Thread
|
||||||
try {
|
try {
|
||||||
|
// Leading-Silence in den Buffer — gibt AudioTrack Zeit anzufahren.
|
||||||
|
val silenceBytes = ((sampleRate * channels * 2) * LEADING_SILENCE_SECONDS).toInt() and 0x7FFFFFFE
|
||||||
|
if (silenceBytes > 0) {
|
||||||
|
val silence = ByteArray(silenceBytes)
|
||||||
|
var silOff = 0
|
||||||
|
while (silOff < silence.size && !writerShouldStop) {
|
||||||
|
val w = t.write(silence, silOff, silence.size - silOff)
|
||||||
|
if (w <= 0) break
|
||||||
|
silOff += w
|
||||||
|
}
|
||||||
|
bytesBuffered += silence.size
|
||||||
|
}
|
||||||
while (!writerShouldStop) {
|
while (!writerShouldStop) {
|
||||||
val data = queue.poll(50, java.util.concurrent.TimeUnit.MILLISECONDS) ?: run {
|
val data = queue.poll(50, java.util.concurrent.TimeUnit.MILLISECONDS) ?: run {
|
||||||
if (endRequested) return@Thread
|
if (endRequested) {
|
||||||
|
// Falls wir vor Pre-Roll enden (kurzer Text): trotzdem abspielen
|
||||||
|
if (!playbackStarted) {
|
||||||
|
try { t.play() } catch (_: Exception) {}
|
||||||
|
playbackStarted = true
|
||||||
|
}
|
||||||
|
return@Thread
|
||||||
|
}
|
||||||
null
|
null
|
||||||
} ?: continue
|
} ?: continue
|
||||||
|
|
||||||
|
// Pre-Roll Check: play() erst wenn genug gepuffert
|
||||||
|
if (!playbackStarted && bytesBuffered + data.size >= prerollBytes) {
|
||||||
|
try {
|
||||||
|
t.play()
|
||||||
|
playbackStarted = true
|
||||||
|
Log.i(TAG, "Playback gestartet nach Pre-Roll ${bytesBuffered + data.size} Bytes")
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Log.w(TAG, "play() failed: ${e.message}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var offset = 0
|
var offset = 0
|
||||||
while (offset < data.size && !writerShouldStop) {
|
while (offset < data.size && !writerShouldStop) {
|
||||||
val written = t.write(data, offset, data.size - offset)
|
val written = t.write(data, offset, data.size - offset)
|
||||||
if (written <= 0) break
|
if (written <= 0) break
|
||||||
offset += written
|
offset += written
|
||||||
}
|
}
|
||||||
|
bytesBuffered += data.size
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
Log.w(TAG, "Writer-Thread Fehler: ${e.message}")
|
Log.w(TAG, "Writer-Thread Fehler: ${e.message}")
|
||||||
} finally {
|
} finally {
|
||||||
|
// Warten bis alle geschriebenen Samples tatsaechlich abgespielt sind,
|
||||||
|
// sonst cuttet t.release() die letzten Sekunden ab.
|
||||||
|
try {
|
||||||
|
val totalFrames = (bytesBuffered / streamBytesPerFrame).toInt()
|
||||||
|
var lastPos = -1
|
||||||
|
var stalledCount = 0
|
||||||
|
while (!writerShouldStop) {
|
||||||
|
val pos = t.playbackHeadPosition
|
||||||
|
if (pos >= totalFrames) break
|
||||||
|
// Safety: wenn Position 2s nicht mehr vorwaerts → AudioTrack hing
|
||||||
|
if (pos == lastPos) {
|
||||||
|
stalledCount++
|
||||||
|
if (stalledCount > 40) {
|
||||||
|
Log.w(TAG, "playback stalled at $pos/$totalFrames — give up")
|
||||||
|
break
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
stalledCount = 0
|
||||||
|
lastPos = pos
|
||||||
|
}
|
||||||
|
Thread.sleep(50)
|
||||||
|
}
|
||||||
|
Log.i(TAG, "Playback fertig: frames=$totalFrames pos=${t.playbackHeadPosition}")
|
||||||
|
} catch (_: Exception) {}
|
||||||
try { t.stop() } catch (_: Exception) {}
|
try { t.stop() } catch (_: Exception) {}
|
||||||
try { t.release() } catch (_: Exception) {}
|
try { t.release() } catch (_: Exception) {}
|
||||||
}
|
}
|
||||||
}, "PcmStreamWriter").apply { start() }
|
}, "PcmStreamWriter").apply { start() }
|
||||||
|
|
||||||
Log.i(TAG, "Stream gestartet: ${sampleRate}Hz ch=$channels buf=${bufferSize}B")
|
Log.i(TAG, "Stream gestartet: ${sampleRate}Hz ch=$channels buf=${bufferSize}B preroll=${prerollBytes}B")
|
||||||
promise.resolve(true)
|
promise.resolve(true)
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
Log.e(TAG, "start fehlgeschlagen", e)
|
Log.e(TAG, "start fehlgeschlagen", e)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "aria-cockpit",
|
"name": "aria-cockpit",
|
||||||
"version": "0.0.4.2",
|
"version": "0.0.4.7",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"android": "react-native run-android",
|
"android": "react-native run-android",
|
||||||
|
|||||||
+20
-19
@@ -150,6 +150,15 @@ def _small_range_to_words(m):
|
|||||||
return f"{_num_to_words_de(a)} bis {_num_to_words_de(b)}"
|
return f"{_num_to_words_de(a)} bis {_num_to_words_de(b)}"
|
||||||
|
|
||||||
|
|
||||||
|
def _decimal_to_words(m):
|
||||||
|
"""'0.1' / '0,1' → 'null komma eins', '1,25' → 'eins komma zwei fuenf'."""
|
||||||
|
int_part = int(m.group(1))
|
||||||
|
dec_part = m.group(2)
|
||||||
|
int_word = _num_to_words_de(int_part) if 0 <= int_part <= 59 else str(int_part)
|
||||||
|
dec_words = " ".join(_num_to_words_de(int(d)) for d in dec_part)
|
||||||
|
return f"{int_word} komma {dec_words}"
|
||||||
|
|
||||||
|
|
||||||
_UNIT_WORDS = [
|
_UNIT_WORDS = [
|
||||||
(r'\bTB\b', 'Terabyte'),
|
(r'\bTB\b', 'Terabyte'),
|
||||||
(r'\bGB\b', 'Gigabyte'),
|
(r'\bGB\b', 'Gigabyte'),
|
||||||
@@ -236,6 +245,11 @@ def clean_text_for_tts(text: str) -> str:
|
|||||||
# Kleine Zahlen-Bereiche ohne "Uhr": "5-6" → "fuenf bis sechs"
|
# Kleine Zahlen-Bereiche ohne "Uhr": "5-6" → "fuenf bis sechs"
|
||||||
t = _re_tts.sub(r'\b(\d{1,2})\s*[-–]\s*(\d{1,2})\b', _small_range_to_words, t)
|
t = _re_tts.sub(r'\b(\d{1,2})\s*[-–]\s*(\d{1,2})\b', _small_range_to_words, t)
|
||||||
|
|
||||||
|
# Dezimalzahlen: "0.1" / "0,5" / "1,25" → "null komma eins" / "null komma fuenf" / ...
|
||||||
|
# Muss vor "Zahl+Einheit" laufen, sonst frisst die Unit-Regel den Nachkommaanteil.
|
||||||
|
# Lookahead verhindert Match auf IP-artigen Strings wie 192.168.1.1.
|
||||||
|
t = _re_tts.sub(r'\b(\d+)[.,](\d+)(?![.,\d])', _decimal_to_words, t)
|
||||||
|
|
||||||
# Zahlen + Einheit: "22GB" → "22 Gigabyte" (Leerzeichen einfuegen)
|
# Zahlen + Einheit: "22GB" → "22 Gigabyte" (Leerzeichen einfuegen)
|
||||||
t = _re_tts.sub(r'(\d+)([A-Za-z]{1,4})\b', r'\1 \2', t)
|
t = _re_tts.sub(r'(\d+)([A-Za-z]{1,4})\b', r'\1 \2', t)
|
||||||
|
|
||||||
@@ -1100,25 +1114,12 @@ class ARIABridge:
|
|||||||
return
|
return
|
||||||
|
|
||||||
elif msg_type == "audio_pcm":
|
elif msg_type == "audio_pcm":
|
||||||
# XTTS-PCM-Stream vom Gaming-PC empfangen → durchleiten zur App.
|
# Audio-PCM geht direkt von XTTS-Bridge an die App.
|
||||||
# Wenn in payload kein messageId (alte XTTS-Bridge), aus requestId auflösen.
|
# Die aria-bridge darf es NICHT rebroadcasten — sonst bekommt die App
|
||||||
error = payload.get("error", "")
|
# jeden Chunk doppelt (einmal direkt von XTTS-Bridge via RVS-Broadcast,
|
||||||
if error:
|
# einmal indirekt via uns).
|
||||||
logger.warning("[rvs] XTTS PCM-Fehler: %s", error)
|
# Wir ignorieren diese Message hier einfach — messageId wird von
|
||||||
return
|
# XTTS-Bridge selbst im Payload mitgeliefert.
|
||||||
linked_message_id = payload.get("messageId", "")
|
|
||||||
if not linked_message_id:
|
|
||||||
req_id_full = payload.get("requestId", "")
|
|
||||||
req_id_base = req_id_full.rsplit("_", 1)[0] if "_" in req_id_full else req_id_full
|
|
||||||
linked_message_id = self._xtts_request_to_message.get(req_id_base, "")
|
|
||||||
# Einfach 1:1 weiterleiten mit eingefuellter messageId
|
|
||||||
forwarded = dict(payload)
|
|
||||||
forwarded["messageId"] = linked_message_id
|
|
||||||
await self._send_to_rvs({
|
|
||||||
"type": "audio_pcm",
|
|
||||||
"payload": forwarded,
|
|
||||||
"timestamp": int(asyncio.get_event_loop().time() * 1000),
|
|
||||||
})
|
|
||||||
return
|
return
|
||||||
|
|
||||||
elif msg_type == "xtts_response":
|
elif msg_type == "xtts_response":
|
||||||
|
|||||||
@@ -127,6 +127,33 @@
|
|||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
<!-- Disk-Space Warnung (dynamisch gesetzt) -->
|
||||||
|
<div id="disk-banner" style="display:none;position:sticky;top:0;z-index:500;padding:10px 14px;border-radius:0;margin:-16px -16px 12px -16px;font-size:13px;">
|
||||||
|
<div style="display:flex;align-items:center;gap:10px;flex-wrap:wrap;">
|
||||||
|
<span id="disk-banner-icon" style="font-size:18px;">⚠️</span>
|
||||||
|
<span id="disk-banner-text" style="flex:1;min-width:200px;font-weight:600;"></span>
|
||||||
|
<button onclick="copyDiskCmd('safe')" class="btn secondary" style="padding:4px 10px;font-size:11px;" title="docker builder prune -a -f && docker image prune -a -f">
|
||||||
|
Sicher aufraeumen
|
||||||
|
</button>
|
||||||
|
<button onclick="document.getElementById('disk-banner-aggressive').style.display=(document.getElementById('disk-banner-aggressive').style.display==='none'?'flex':'none')"
|
||||||
|
class="btn secondary" style="padding:4px 10px;font-size:11px;">
|
||||||
|
Mehr ▾
|
||||||
|
</button>
|
||||||
|
<button onclick="document.getElementById('disk-banner').style.display='none'" class="btn secondary" style="padding:4px 10px;font-size:11px;">Schliessen</button>
|
||||||
|
</div>
|
||||||
|
<!-- Aggressive Variante (erst nach Klick sichtbar) -->
|
||||||
|
<div id="disk-banner-aggressive" style="display:none;margin-top:10px;padding:8px;background:rgba(0,0,0,0.25);border-radius:4px;flex-direction:column;gap:6px;font-size:12px;">
|
||||||
|
<div>
|
||||||
|
<b>Sicher</b> (empfohlen) — Build-Cache + ungenutzte Images, keine Volumes:<br>
|
||||||
|
<code style="font-family:monospace;">docker builder prune -a -f && docker image prune -a -f</code>
|
||||||
|
</div>
|
||||||
|
<div style="color:#FFAA55;">
|
||||||
|
<b>Aggressiv</b> — zusaetzlich ungenutzte Volumes. <b>Nur wenn alle ARIA-Container laufen</b>, sonst riskierst du Daten-Verlust (Sessions, SSH-Keys, Shared):<br>
|
||||||
|
<code style="font-family:monospace;">docker system prune -a --volumes -f</code>
|
||||||
|
<button onclick="copyDiskCmd('aggressive')" class="btn secondary" style="padding:2px 8px;font-size:10px;margin-left:6px;">Kopieren</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<h1>ARIA Diagnostic</h1>
|
<h1>ARIA Diagnostic</h1>
|
||||||
|
|
||||||
<!-- Haupt-Navigation -->
|
<!-- Haupt-Navigation -->
|
||||||
@@ -753,6 +780,11 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (msg.type === 'disk_status') {
|
||||||
|
updateDiskBanner(msg);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (msg.type === 'mode' && msg.payload) {
|
if (msg.type === 'mode' && msg.payload) {
|
||||||
// Bridge hat den Modus geaendert (evtl. von anderer App/Diagnostic) — UI syncen
|
// Bridge hat den Modus geaendert (evtl. von anderer App/Diagnostic) — UI syncen
|
||||||
const mode = (msg.payload.mode || '').toLowerCase();
|
const mode = (msg.payload.mode || '').toLowerCase();
|
||||||
@@ -2155,6 +2187,53 @@
|
|||||||
const ttsToggleEl = document.getElementById('tts-debug-toggle');
|
const ttsToggleEl = document.getElementById('tts-debug-toggle');
|
||||||
if (ttsToggleEl) ttsToggleEl.checked = showTtsDebug;
|
if (ttsToggleEl) ttsToggleEl.checked = showTtsDebug;
|
||||||
|
|
||||||
|
// Disk-Space Banner aktualisieren (wird vom Server via disk_status gepusht)
|
||||||
|
function updateDiskBanner(status) {
|
||||||
|
const banner = document.getElementById('disk-banner');
|
||||||
|
const icon = document.getElementById('disk-banner-icon');
|
||||||
|
const text = document.getElementById('disk-banner-text');
|
||||||
|
if (!banner) return;
|
||||||
|
if (!status || status.level === 'ok') {
|
||||||
|
banner.style.display = 'none';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const gb = (n) => (n / 1024 / 1024 / 1024).toFixed(1);
|
||||||
|
const pct = status.percent;
|
||||||
|
const used = gb(status.usedBytes);
|
||||||
|
const total = gb(status.totalBytes);
|
||||||
|
const avail = gb(status.availBytes);
|
||||||
|
let bg, col, msg;
|
||||||
|
if (status.level === 'critical') {
|
||||||
|
bg = '#5C1A1A'; col = '#FF6B6B'; icon.innerHTML = '🚨'; // 🚨
|
||||||
|
msg = `KRITISCH: Platte ${pct}% voll (${used}GB von ${total}GB, nur noch ${avail}GB frei). aria-core kann bald nicht mehr schreiben — sofort aufraeumen!`;
|
||||||
|
} else if (status.level === 'warn') {
|
||||||
|
bg = '#5C3A1A'; col = '#FFAA55'; icon.innerHTML = '⚠️'; // ⚠️
|
||||||
|
msg = `Warnung: Platte ${pct}% voll (${avail}GB frei). Bald aufraeumen.`;
|
||||||
|
} else {
|
||||||
|
bg = '#4A3A1A'; col = '#FFD60A'; icon.innerHTML = 'ℹ️'; // ℹ️
|
||||||
|
msg = `Hinweis: Platte ${pct}% voll (${avail}GB frei).`;
|
||||||
|
}
|
||||||
|
banner.style.background = bg;
|
||||||
|
banner.style.color = col;
|
||||||
|
banner.style.borderBottom = `2px solid ${col}`;
|
||||||
|
text.textContent = msg;
|
||||||
|
banner.style.display = 'block';
|
||||||
|
}
|
||||||
|
|
||||||
|
function copyDiskCmd(variant) {
|
||||||
|
const cmd = variant === 'aggressive'
|
||||||
|
? 'docker system prune -a --volumes -f'
|
||||||
|
: 'docker builder prune -a -f && docker image prune -a -f';
|
||||||
|
navigator.clipboard.writeText(cmd).then(() => {
|
||||||
|
const btn = event.target;
|
||||||
|
const old = btn.textContent;
|
||||||
|
btn.textContent = 'Kopiert!';
|
||||||
|
setTimeout(() => { btn.textContent = old; }, 1500);
|
||||||
|
}).catch(() => {
|
||||||
|
alert('Kopieren fehlgeschlagen — Befehl: ' + cmd);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
connectWS();
|
connectWS();
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@@ -1148,6 +1148,53 @@ function updateAgentActivity() {
|
|||||||
watchdogWarned = false;
|
watchdogWarned = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ── Disk-Space Monitor ───────────────────────────────
|
||||||
|
// Prueft regelmaessig die Host-Disk (via gemountetem /shared) und
|
||||||
|
// broadcastet bei kritischen Schwellwerten ein disk_status Event.
|
||||||
|
let lastDiskStatus = null;
|
||||||
|
let currentDiskStatus = null; // Vollstaendig fuer neu verbundene Clients
|
||||||
|
function checkDiskSpace() {
|
||||||
|
const { exec } = require("child_process");
|
||||||
|
exec("df -B1 /shared", (err, stdout) => {
|
||||||
|
if (err) return;
|
||||||
|
const lines = stdout.trim().split("\n");
|
||||||
|
if (lines.length < 2) return;
|
||||||
|
const cols = lines[1].split(/\s+/);
|
||||||
|
// Filesystem Size Used Avail Use% MountedOn
|
||||||
|
const total = parseInt(cols[1], 10);
|
||||||
|
const used = parseInt(cols[2], 10);
|
||||||
|
const avail = parseInt(cols[3], 10);
|
||||||
|
if (!total) return;
|
||||||
|
const pct = Math.round((used / total) * 100);
|
||||||
|
let level = "ok";
|
||||||
|
if (pct >= 95) level = "critical";
|
||||||
|
else if (pct >= 85) level = "warn";
|
||||||
|
else if (pct >= 70) level = "info";
|
||||||
|
const status = {
|
||||||
|
type: "disk_status",
|
||||||
|
level,
|
||||||
|
percent: pct,
|
||||||
|
usedBytes: used,
|
||||||
|
totalBytes: total,
|
||||||
|
availBytes: avail,
|
||||||
|
};
|
||||||
|
currentDiskStatus = status;
|
||||||
|
// Nur broadcasten wenn sich was geaendert hat (oder alle 60s Refresh)
|
||||||
|
const key = `${level}-${pct}`;
|
||||||
|
if (lastDiskStatus !== key) {
|
||||||
|
lastDiskStatus = key;
|
||||||
|
broadcast(status);
|
||||||
|
if (level !== "ok") {
|
||||||
|
log(level === "critical" ? "error" : "warn", "server",
|
||||||
|
`Disk ${pct}% belegt (${(used/1024/1024/1024).toFixed(1)}GB von ${(total/1024/1024/1024).toFixed(1)}GB)`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
// Beim Start + alle 30s
|
||||||
|
setTimeout(checkDiskSpace, 2000);
|
||||||
|
setInterval(checkDiskSpace, 30000);
|
||||||
|
|
||||||
// Watchdog prüft alle 30s ob ARIA nach einer gesendeten Nachricht reagiert
|
// Watchdog prüft alle 30s ob ARIA nach einer gesendeten Nachricht reagiert
|
||||||
setInterval(async () => {
|
setInterval(async () => {
|
||||||
if (pendingMessageTime === 0) return; // Keine Nachricht gesendet
|
if (pendingMessageTime === 0) return; // Keine Nachricht gesendet
|
||||||
@@ -1281,6 +1328,8 @@ wss.on("connection", (ws) => {
|
|||||||
browserClients.add(ws);
|
browserClients.add(ws);
|
||||||
// Initialen State + letzte Logs senden
|
// Initialen State + letzte Logs senden
|
||||||
ws.send(JSON.stringify({ type: "init", state, logs: logs.slice(-100) }));
|
ws.send(JSON.stringify({ type: "init", state, logs: logs.slice(-100) }));
|
||||||
|
// Letzten Disk-Status mitgeben damit der Client sofort weiss wie's um Platz steht
|
||||||
|
if (currentDiskStatus) ws.send(JSON.stringify(currentDiskStatus));
|
||||||
|
|
||||||
ws.on("message", (raw) => {
|
ws.on("message", (raw) => {
|
||||||
try {
|
try {
|
||||||
|
|||||||
+166
-97
@@ -95,7 +95,20 @@ function connectRVS(forcePlain) {
|
|||||||
|
|
||||||
// ── TTS Request Handler ─────────────────────────────
|
// ── TTS Request Handler ─────────────────────────────
|
||||||
|
|
||||||
async function handleTTSRequest(payload) {
|
// ── TTS-Queue ──────────────────────────────────────
|
||||||
|
// XTTS verarbeitet Requests sequenziell, damit Streams sich nicht ueberlappen.
|
||||||
|
// Ohne Queue wuerden parallele Requests parallel streamen → App bekommt
|
||||||
|
// interleaved PCM-Chunks aus zwei Rendern → klingt wie Chaos.
|
||||||
|
let ttsQueue = Promise.resolve();
|
||||||
|
|
||||||
|
function handleTTSRequest(payload) {
|
||||||
|
ttsQueue = ttsQueue.then(() => _runTTSRequest(payload)).catch(err => {
|
||||||
|
log(`TTS-Queue Fehler: ${err.message}`);
|
||||||
|
});
|
||||||
|
return ttsQueue;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function _runTTSRequest(payload) {
|
||||||
const { text, voice, requestId, language, messageId } = payload;
|
const { text, voice, requestId, language, messageId } = payload;
|
||||||
if (!text) return;
|
if (!text) return;
|
||||||
|
|
||||||
@@ -116,87 +129,70 @@ async function handleTTSRequest(payload) {
|
|||||||
.replace(/\(\)/g, "")
|
.replace(/\(\)/g, "")
|
||||||
.trim();
|
.trim();
|
||||||
|
|
||||||
// Satzweise Chunks (XTTS Modell laedt Context pro Call — Saetze gruppieren)
|
log(`TTS-Request (streaming): "${cleanText.slice(0, 80)}..." (${cleanText.length} chars, voice: ${voice || "default"})`);
|
||||||
const sentences = cleanText.split(/(?<=[.!?])\s+/)
|
|
||||||
.map(s => s.trim())
|
|
||||||
.filter(s => s.length > 0)
|
|
||||||
.map(s => s.replace(/[.]+$/, ''));
|
|
||||||
|
|
||||||
const MAX_CHUNK_CHARS = 150;
|
|
||||||
const chunks = [];
|
|
||||||
let currentChunk = '';
|
|
||||||
for (const sentence of sentences) {
|
|
||||||
if (currentChunk && (currentChunk.length + sentence.length + 2) > MAX_CHUNK_CHARS) {
|
|
||||||
chunks.push(currentChunk);
|
|
||||||
currentChunk = sentence;
|
|
||||||
} else {
|
|
||||||
currentChunk = currentChunk ? currentChunk + ', ' + sentence : sentence;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (currentChunk) chunks.push(currentChunk);
|
|
||||||
if (chunks.length === 0) return;
|
|
||||||
|
|
||||||
log(`TTS-Request (streaming): "${cleanText.slice(0, 60)}..." (${chunks.length} Chunks, voice: ${voice || "default"})`);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const voiceSample = voice ? path.join(VOICES_DIR, `${voice}.wav`) : null;
|
const voiceSample = voice ? path.join(VOICES_DIR, `${voice}.wav`) : null;
|
||||||
const hasCustomVoice = voiceSample && fs.existsSync(voiceSample);
|
const hasCustomVoice = voiceSample && fs.existsSync(voiceSample);
|
||||||
|
|
||||||
let chunkIndex = 0;
|
let chunkIndex = 0;
|
||||||
// Audio-Format (aus WAV-Header extrahiert, einmal pro Request)
|
|
||||||
let pcmMeta = null;
|
let pcmMeta = null;
|
||||||
|
|
||||||
for (let i = 0; i < chunks.length; i++) {
|
const onChunk = (pcmBase64, meta) => {
|
||||||
const chunk = chunks[i];
|
if (!pcmMeta) pcmMeta = meta;
|
||||||
const isLastChunk = i === chunks.length - 1;
|
sendToRVS({
|
||||||
try {
|
type: "audio_pcm",
|
||||||
// Streaming: PCM-Frames werden nacheinander an RVS gepusht,
|
payload: {
|
||||||
// sobald sie vom XTTS-Server reinkommen
|
requestId: requestId || "",
|
||||||
await streamXTTSAsPCM(
|
messageId: messageId || "",
|
||||||
chunk,
|
base64: pcmBase64,
|
||||||
language || "de",
|
format: "pcm_s16le",
|
||||||
hasCustomVoice ? voiceSample : null,
|
sampleRate: meta.sampleRate,
|
||||||
(pcmBase64, meta) => {
|
channels: meta.channels,
|
||||||
if (!pcmMeta) pcmMeta = meta;
|
voice: voice || "default",
|
||||||
sendToRVS({
|
chunk: chunkIndex++,
|
||||||
type: "audio_pcm",
|
final: false,
|
||||||
payload: {
|
},
|
||||||
requestId: requestId || "",
|
timestamp: Date.now(),
|
||||||
messageId: messageId || "",
|
});
|
||||||
base64: pcmBase64,
|
};
|
||||||
format: "pcm_s16le",
|
|
||||||
sampleRate: meta.sampleRate,
|
|
||||||
channels: meta.channels,
|
|
||||||
voice: voice || "default",
|
|
||||||
chunk: chunkIndex++,
|
|
||||||
final: false,
|
|
||||||
},
|
|
||||||
timestamp: Date.now(),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
// Nach letztem Text-Chunk: final-Flag senden damit App weiss "fertig"
|
// /tts_stream fuer echtes Streaming (funktioniert im XTTS local-Mode).
|
||||||
if (isLastChunk && pcmMeta) {
|
// Wenn Server im apiManual/api-Mode laeuft: 400 → Fallback auf /tts_to_audio/.
|
||||||
sendToRVS({
|
try {
|
||||||
type: "audio_pcm",
|
await streamXTTSAsPCM(
|
||||||
payload: {
|
cleanText,
|
||||||
requestId: requestId || "",
|
language || "de",
|
||||||
messageId: messageId || "",
|
hasCustomVoice ? voiceSample : null,
|
||||||
base64: "",
|
onChunk,
|
||||||
format: "pcm_s16le",
|
);
|
||||||
sampleRate: pcmMeta.sampleRate,
|
} catch (streamErr) {
|
||||||
channels: pcmMeta.channels,
|
log(`/tts_stream fehlgeschlagen (${streamErr.message.slice(0, 100)}) — Fallback /tts_to_audio/`);
|
||||||
voice: voice || "default",
|
await streamXTTSBatch(
|
||||||
chunk: chunkIndex++,
|
cleanText,
|
||||||
final: true,
|
language || "de",
|
||||||
},
|
hasCustomVoice ? voiceSample : null,
|
||||||
timestamp: Date.now(),
|
onChunk,
|
||||||
});
|
);
|
||||||
}
|
}
|
||||||
} catch (chunkErr) {
|
|
||||||
log(`TTS [${i + 1}/${chunks.length}] Fehler: ${chunkErr.message} — ueberspringe`);
|
// Am Ende: final-Flag damit App weiss "fertig" und Cache geschrieben werden kann
|
||||||
}
|
if (pcmMeta) {
|
||||||
|
sendToRVS({
|
||||||
|
type: "audio_pcm",
|
||||||
|
payload: {
|
||||||
|
requestId: requestId || "",
|
||||||
|
messageId: messageId || "",
|
||||||
|
base64: "",
|
||||||
|
format: "pcm_s16le",
|
||||||
|
sampleRate: pcmMeta.sampleRate,
|
||||||
|
channels: pcmMeta.channels,
|
||||||
|
voice: voice || "default",
|
||||||
|
chunk: chunkIndex++,
|
||||||
|
final: true,
|
||||||
|
},
|
||||||
|
timestamp: Date.now(),
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
log(`TTS komplett: ${chunkIndex} PCM-Frames gestreamt (${cleanText.length} chars)`);
|
log(`TTS komplett: ${chunkIndex} PCM-Frames gestreamt (${cleanText.length} chars)`);
|
||||||
@@ -211,45 +207,48 @@ async function handleTTSRequest(payload) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ruft /tts_to_audio/ auf und streamt das resultierende WAV bereits waehrend
|
* Ruft /tts_stream auf — echter Streaming-Endpoint bei daswer123.
|
||||||
* des Empfangs in PCM-Frames an den Callback. Der WAV-Header wird einmal
|
* Schickt was der Server verlangt (allow: GET), aber mit JSON-Body
|
||||||
* geparst, danach werden nur noch raw PCM-Samples weitergeleitet.
|
* als POST scheitert mit 405. Manche Versionen wollen GET + Query,
|
||||||
*
|
* andere POST + JSON. Testen was funktioniert.
|
||||||
* Warum nicht echtes /tts_stream/? daswer123 hat den Endpoint, aber die
|
|
||||||
* Audio-Quality ist dort niedriger und er produziert beim ersten Chunk
|
|
||||||
* oft Artefakte. Pragmatischer Weg: /tts_to_audio/ + Response-Stream
|
|
||||||
* chunkweise auslesen. Das ist zwar kein echtes Server-Streaming, aber
|
|
||||||
* gibt uns deutlich kleinere Netzwerk-Haeppchen und die App kann via
|
|
||||||
* AudioTrack MODE_STREAM sofort nahtlos abspielen.
|
|
||||||
*/
|
*/
|
||||||
function streamXTTSAsPCM(text, language, speakerWav, onPcmChunk) {
|
function streamXTTSAsPCM(text, language, speakerWav, onPcmChunk) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
const body = JSON.stringify({
|
// Wichtig: speaker_wav MUSS als Query-Key dabei sein (Pydantic required) —
|
||||||
text,
|
// auch bei default-voice mit leerem Wert. Sonst gibt's HTTP 422.
|
||||||
language,
|
// stream_chunk_size=100: Kompromiss zwischen first-audio-latency und
|
||||||
speaker_wav: speakerWav || "",
|
// gap-risk. Bei RTX 3060 (RTF 1.48) ~3s bis erster Audio, Chunks gross
|
||||||
});
|
// genug dass der AudioTrack-Buffer (128KB ≈ 2.7s) zwischen Chunks nicht
|
||||||
|
// leerlauft.
|
||||||
|
const qs = new URLSearchParams();
|
||||||
|
qs.set("text", text);
|
||||||
|
qs.set("language", language || "de");
|
||||||
|
qs.set("speaker_wav", speakerWav || "");
|
||||||
|
qs.set("stream_chunk_size", "100");
|
||||||
|
|
||||||
const url = new URL(`${XTTS_API_URL}/tts_to_audio/`);
|
const url = new URL(XTTS_API_URL);
|
||||||
|
const fullPath = `/tts_stream?${qs.toString()}`;
|
||||||
const options = {
|
const options = {
|
||||||
hostname: url.hostname,
|
hostname: url.hostname,
|
||||||
port: url.port,
|
port: url.port || 80,
|
||||||
path: url.pathname,
|
path: fullPath,
|
||||||
method: "POST",
|
method: "GET",
|
||||||
headers: {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
"Content-Length": Buffer.byteLength(body),
|
|
||||||
},
|
|
||||||
timeout: 60000,
|
timeout: 60000,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
log(`TTS GET /tts_stream?text=${text.slice(0, 30)}... (voice=${speakerWav ? "custom" : "default"})`);
|
||||||
|
|
||||||
const req = http.request(options, (res) => {
|
const req = http.request(options, (res) => {
|
||||||
if (res.statusCode !== 200) {
|
if (res.statusCode !== 200) {
|
||||||
let body = "";
|
let body = "";
|
||||||
res.on("data", (d) => { body += d.toString(); });
|
res.on("data", (d) => { body += d.toString(); });
|
||||||
res.on("end", () => reject(new Error(`XTTS HTTP ${res.statusCode}: ${body.slice(0, 200)}`)));
|
res.on("end", () => {
|
||||||
|
log(`XTTS /tts_stream ${res.statusCode}: ${body.slice(0, 300)}`);
|
||||||
|
reject(new Error(`XTTS HTTP ${res.statusCode}: ${body.slice(0, 200)}`));
|
||||||
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
log(`TTS stream verbunden, empfange PCM...`);
|
||||||
|
|
||||||
let headerParsed = false;
|
let headerParsed = false;
|
||||||
let sampleRate = 24000;
|
let sampleRate = 24000;
|
||||||
@@ -301,6 +300,76 @@ function streamXTTSAsPCM(text, language, speakerWav, onPcmChunk) {
|
|||||||
|
|
||||||
req.on("error", reject);
|
req.on("error", reject);
|
||||||
req.on("timeout", () => { req.destroy(); reject(new Error("XTTS API Timeout (60s)")); });
|
req.on("timeout", () => { req.destroy(); reject(new Error("XTTS API Timeout (60s)")); });
|
||||||
|
req.end();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fallback: /tts_to_audio/ (POST JSON) — rendert komplett, dann response.
|
||||||
|
* Kein echtes Streaming, aber stabil als Backup wenn /tts_stream nicht geht.
|
||||||
|
* Shared chunking-Logik mit streamXTTSAsPCM — parst WAV-Header, stueckelt PCM.
|
||||||
|
*/
|
||||||
|
function streamXTTSBatch(text, language, speakerWav, onPcmChunk) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
const body = JSON.stringify({
|
||||||
|
text,
|
||||||
|
language: language || "de",
|
||||||
|
speaker_wav: speakerWav || "",
|
||||||
|
});
|
||||||
|
const url = new URL(XTTS_API_URL);
|
||||||
|
const options = {
|
||||||
|
hostname: url.hostname,
|
||||||
|
port: url.port || 80,
|
||||||
|
path: "/tts_to_audio/",
|
||||||
|
method: "POST",
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
"Content-Length": Buffer.byteLength(body),
|
||||||
|
},
|
||||||
|
timeout: 60000,
|
||||||
|
};
|
||||||
|
|
||||||
|
const req = http.request(options, (res) => {
|
||||||
|
if (res.statusCode !== 200) {
|
||||||
|
let rb = "";
|
||||||
|
res.on("data", (d) => { rb += d.toString(); });
|
||||||
|
res.on("end", () => reject(new Error(`XTTS Batch HTTP ${res.statusCode}: ${rb.slice(0, 200)}`)));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let headerParsed = false;
|
||||||
|
let sampleRate = 24000;
|
||||||
|
let channels = 1;
|
||||||
|
let leftover = Buffer.alloc(0);
|
||||||
|
let headerBuf = Buffer.alloc(0);
|
||||||
|
const HEADER_BYTES = 44;
|
||||||
|
const PCM_CHUNK_BYTES = 8192;
|
||||||
|
|
||||||
|
res.on("data", (chunk) => {
|
||||||
|
let data = chunk;
|
||||||
|
if (!headerParsed) {
|
||||||
|
headerBuf = Buffer.concat([headerBuf, data]);
|
||||||
|
if (headerBuf.length < HEADER_BYTES) return;
|
||||||
|
const header = headerBuf.slice(0, HEADER_BYTES);
|
||||||
|
try { channels = header.readUInt16LE(22); sampleRate = header.readUInt32LE(24); } catch (_) {}
|
||||||
|
headerParsed = true;
|
||||||
|
data = headerBuf.slice(HEADER_BYTES);
|
||||||
|
}
|
||||||
|
let combined = Buffer.concat([leftover, data]);
|
||||||
|
while (combined.length >= PCM_CHUNK_BYTES) {
|
||||||
|
const slice = combined.slice(0, PCM_CHUNK_BYTES);
|
||||||
|
combined = combined.slice(PCM_CHUNK_BYTES);
|
||||||
|
onPcmChunk(slice.toString("base64"), { sampleRate, channels });
|
||||||
|
}
|
||||||
|
leftover = combined;
|
||||||
|
});
|
||||||
|
res.on("end", () => {
|
||||||
|
if (leftover.length > 0) onPcmChunk(leftover.toString("base64"), { sampleRate, channels });
|
||||||
|
resolve();
|
||||||
|
});
|
||||||
|
res.on("error", reject);
|
||||||
|
});
|
||||||
|
req.on("error", reject);
|
||||||
|
req.on("timeout", () => { req.destroy(); reject(new Error("XTTS Batch Timeout (60s)")); });
|
||||||
req.write(body);
|
req.write(body);
|
||||||
req.end();
|
req.end();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -33,6 +33,12 @@ services:
|
|||||||
- ./voices:/voices # Custom Voice Samples
|
- ./voices:/voices # Custom Voice Samples
|
||||||
environment:
|
environment:
|
||||||
- COQUI_TOS_AGREED=1
|
- COQUI_TOS_AGREED=1
|
||||||
|
# Local-Modus statt default "apiManual": Modell bleibt im GPU-VRAM,
|
||||||
|
# Render startet sofort, /tts_stream funktioniert.
|
||||||
|
# Default-CMD des Images liest diese ENV: -ms ${MODEL_SOURCE:-"apiManual"}
|
||||||
|
- MODEL_SOURCE=local
|
||||||
|
# Speaker-Folder auf unsere gemounteten voices zeigen lassen
|
||||||
|
- EXAMPLE_FOLDER=/voices
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
# ─── XTTS Bridge (verbindet zu RVS) ───────────
|
# ─── XTTS Bridge (verbindet zu RVS) ───────────
|
||||||
|
|||||||
Reference in New Issue
Block a user