diff --git a/dist/roverd-linux-amd64 b/dist/roverd-linux-amd64 index 33da68da..a195c861 100755 Binary files a/dist/roverd-linux-amd64 and b/dist/roverd-linux-amd64 differ diff --git a/dist/roverd-linux-arm64 b/dist/roverd-linux-arm64 index 8380ac4c..99c35f67 100755 Binary files a/dist/roverd-linux-arm64 and b/dist/roverd-linux-arm64 differ diff --git a/dist/roverd-linux-armv6 b/dist/roverd-linux-armv6 index 5d124506..69570e52 100755 Binary files a/dist/roverd-linux-armv6 and b/dist/roverd-linux-armv6 differ diff --git a/dist/roverd-linux-armv7 b/dist/roverd-linux-armv7 index f16a9294..8f2efdaf 100755 Binary files a/dist/roverd-linux-armv7 and b/dist/roverd-linux-armv7 differ diff --git a/rover/roverd/config.go b/rover/roverd/config.go index 40006a57..7d317398 100644 --- a/rover/roverd/config.go +++ b/rover/roverd/config.go @@ -265,7 +265,7 @@ func DefaultConfig() Config { Video: VideoMediaConfig{ Profile: "v4l2", - Enabled: false, + Enabled: true, Device: "/dev/video0", InputFormat: "mjpeg", Width: 640, @@ -277,7 +277,7 @@ func DefaultConfig() Config { }, AudioCapture: AudioCaptureConfig{ Profile: "alsa", - Enabled: false, + Enabled: true, SampleRate: 48000, Channels: 2, @@ -285,7 +285,7 @@ func DefaultConfig() Config { }, AudioPlayback: AudioPlaybackConfig{ Profile: "alsa", - Enabled: false, + Enabled: true, Normalize: true, NormalizeFilter: "dynaudnorm=f=75:g=15:m=10:p=0.9,alimiter=limit=0.85:level=disabled", @@ -293,13 +293,13 @@ func DefaultConfig() Config { }, Audio: AudioConfig{ InputDevice: "hw:0,0", OutputDevice: "hw:0,0", MixerCard: "0", OutputSampleRate: 48000, OutputChannels: 2, - TTSEnabled: false, - DefaultEngine: "flite", + TTSEnabled: true, + DefaultEngine: "google", DefaultVoice: "rms", DefaultPitch: 50, }, Horn: HornConfig{ - Enabled: false, + Enabled: true, Volume: 0.25, SampleRate: 48000, Channels: 1, @@ -460,7 +460,7 @@ func clampFloat(value, min, max float64) float64 { func validateAudioConfig(cfg *AudioConfig) { if cfg.DefaultEngine == "" { - cfg.DefaultEngine = "flite" + cfg.DefaultEngine = "google" } if cfg.DefaultVoice == "" { cfg.DefaultVoice = "rms" diff --git a/server/src/services/roverManagementService/index.js b/server/src/services/roverManagementService/index.js index 3802f96c..a79929de 100644 --- a/server/src/services/roverManagementService/index.js +++ b/server/src/services/roverManagementService/index.js @@ -18,6 +18,7 @@ function snapshot(record) { schema: record.schema, profiles: record.profiles, mediaStatus: record.mediaStatus, + mediaOutput: record.mediaOutput, updateStatus: record.updateStatus, hostStats: record.hostStats || null, notices: record.notices, @@ -84,7 +85,7 @@ managementWSS.on('connection', (ws) => { if (typeof msg.name !== 'string' || !msg.name || !msg.config || !msg.schema) throw new Error('Invalid management hello'); clearTimeout(helloTimeout); const previous = rovers.get(msg.name); - record = { roverId: msg.name, ws, config: msg.config, schema: msg.schema, profiles: msg.profiles, mediaStatus: msg.mediaStatus || {}, updateStatus: msg.updateStatus || null, notices: [] }; + record = { roverId: msg.name, ws, config: msg.config, schema: msg.schema, profiles: msg.profiles, mediaStatus: msg.mediaStatus || {}, mediaOutput: {}, updateStatus: msg.updateStatus || null, notices: [] }; rovers.set(record.roverId, record); previous?.ws.close(1000, 'Replaced by new connection'); notifyAdmins('roverManagement:changed', snapshot(record)); @@ -103,8 +104,16 @@ managementWSS.on('connection', (ws) => { notifyAdmins('roverManagement:hostStats', { roverId: record.roverId, ...msg }); } else if (msg.type === 'event') { if (msg.event === 'media.status') record.mediaStatus[msg.data.category] = msg.data.message; - record.notices.push(msg); - if (record.notices.length > 100) record.notices.shift(); + if (msg.event === 'media.output') { + const category = msg.data?.category; + if (['video', 'audioCapture', 'audioPlayback'].includes(category)) { + // Keep raw chunks per command so other streamers/notices cannot evict them. + record.mediaOutput[category] = ((record.mediaOutput[category] || '') + (msg.data.message || '')).slice(-65536); + } + } else { + record.notices.push(msg); + if (record.notices.length > 100) record.notices.shift(); + } notifyAdmins('roverManagement:event', { roverId: record.roverId, ...msg }); if (!msg.event?.startsWith('media.')) sendAlert({ color: '#00bcd4', title: record.roverId, message: msg.data?.message || msg.event }); } diff --git a/webui/src/admin/components/RoverConfigurationEditor.jsx b/webui/src/admin/components/RoverConfigurationEditor.jsx index 4e7d23c2..558fc841 100644 --- a/webui/src/admin/components/RoverConfigurationEditor.jsx +++ b/webui/src/admin/components/RoverConfigurationEditor.jsx @@ -1,4 +1,4 @@ -import { useEffect, useState } from 'react'; +import { useEffect, useRef, useState } from 'react'; import SchemaConfigurationForm from './SchemaConfigurationForm.jsx'; function request(socket, event, payload = {}) { @@ -62,6 +62,12 @@ function RoverForm({ socket, record, online }) { } function MediaProfiles({ socket, record, online, category, configDirty }) { + const outputRef = useRef(null); + const output = record.mediaOutput?.[category] || ''; + useEffect(() => { + const element = outputRef.current; + if (element) element.scrollTop = element.scrollHeight; + }, [output]); const [profile, setProfile] = useState({ id: 'custom', name: '', description: '', setup: '', run: '' }); const [message, setMessage] = useState(''); const [busy, setBusy] = useState(false); @@ -93,9 +99,7 @@ function MediaProfiles({ socket, record, online, category, configDirty }) {
{message}
{(record.notices || [])
- .filter((event) => event.event?.startsWith('media.') && event.data?.category === category)
- .map((event) => `${event.event === 'media.status' ? '[status] ' : ''}${event.data?.message || ''}`).join('\n')}{output || 'Waiting for command stdout/stderrā¦'}
;
}
@@ -124,7 +128,9 @@ export default function RoverConfigurationEditor({ socket, selected, onSelect })
const mediaEvent = ({ roverId, ...event }) => {
if (!event.event?.startsWith('media.')) return;
setRecords((previous) => previous[roverId] ? { ...previous, [roverId]: {
- ...previous[roverId], mediaStatus: event.event === 'media.status'
+ ...previous[roverId], mediaOutput: event.event === 'media.output'
+ ? { ...previous[roverId].mediaOutput, [event.data.category]: ((previous[roverId].mediaOutput?.[event.data.category] || '') + (event.data.message || '')).slice(-65536) }
+ : previous[roverId].mediaOutput, mediaStatus: event.event === 'media.status'
? { ...previous[roverId].mediaStatus, [event.data.category]: event.data.message } : previous[roverId].mediaStatus, notices: [...(previous[roverId].notices || []), event].slice(-100),
} } : previous);
};