rah

server/src/services/discordBotService/commands/status.js

@@ -6,6 +6,21 @@ const { EmbedBuilder } = require('discord.js');
 function createStatusCommand({ rovers, roverManager }) {
   function formatVoltage(voltageMv) { return voltageMv == null ? 'n/a' : `${(voltageMv / 1000).toFixed(2)}V`; }
   function formatCurrent(currentMa) { return currentMa == null ? 'n/a' : `${currentMa}mA`; }
+  function formatDockEmoji(docked) { return docked ? '🏠' : '🧭'; }
+  function formatChargeEmoji(charging) { return charging ? '⚡' : '🔌'; }
+  function formatLockEmoji(locked) { return locked ? '🔒' : '🔓'; }
+  function formatBatteryEmoji(batteryState) {
+    if (batteryState?.urgentActive) return '🛑';
+    if (batteryState?.warnActive) return '⚠️';
+    return '🔋';
+  }
+  function formatOiEmoji(oiMode) {
+    if (oiMode === 'full') return '🕹️';
+    if (oiMode === 'safe') return '🧰';
+    if (oiMode === 'passive') return '🟢';
+    if (oiMode === 'off') return '⏹️';
+    return '❔';
+  }
   function formatChargeState(batteryState) {
     if (!batteryState) return 'n/a';
     const chargeText = batteryState.charge != null && batteryState.capacity != null ? `${batteryState.charge}/${batteryState.capacity}mAh` : 'n/a';
@@ -44,7 +59,25 @@ function createStatusCommand({ rovers, roverManager }) {
     }
     snapshots.forEach((s) => {
       const lockLabel = s.locked ? `locked${s.lockReason ? ` (${s.lockReason})` : ''}` : 'unlocked';
-      embed.addFields({ name: s.name, value: [`Dock: ${s.docked ? 'docked' : 'undocked'}`, `Charging: ${s.charging ? `charging (${s.chargingLabel})` : 'not charging'}`, `Battery: ${formatChargeState(s.batteryState)}`, `Voltage: ${formatVoltage(s.voltageMv)}`, `Current: ${formatCurrent(s.currentMa)}`, `OI: ${s.oiMode}`, `Lock: ${lockLabel}`].join('\n'), inline: true });
+      const header = [
+        formatBatteryEmoji(s.batteryState),
+        formatDockEmoji(s.docked),
+        formatChargeEmoji(s.charging),
+        formatLockEmoji(s.locked),
+      ].join(' ');
+      embed.addFields({
+        name: `${header} ${s.name}`,
+        value: [
+          `Dock: ${s.docked ? 'docked' : 'undocked'}`,
+          `Charging: ${s.charging ? `charging (${s.chargingLabel})` : 'not charging'}`,
+          `Battery: ${formatChargeState(s.batteryState)}`,
+          `Voltage: ${formatVoltage(s.voltageMv)}`,
+          `Current: ${formatCurrent(s.currentMa)}`,
+          `OI: ${s.oiMode} ${formatOiEmoji(s.oiMode)}`,
+          `Lock: ${lockLabel}`,
+        ].join('\n'),
+        inline: true,
+      });
     });
     return embed;
   }

server/src/services/discordBotService/integrations/busEvents.js

@@ -4,7 +4,7 @@
 const { EmbedBuilder, AttachmentBuilder } = require('discord.js');
 
 function createBusEventHandler(deps) {
-  const { logger, discordConfig, getMode, MODES, roverManager, schedulePresenceRotation, formatDuration, sendToChannel } = deps;
+  const { logger, discordConfig, MODES, roverManager, rovers, schedulePresenceRotation, formatDuration, sendToChannel } = deps;
   const ADMIN_ALERT_EVENT_TYPES = new Set(['rover.online', 'rover.offline', 'rover.dockGuard', 'battery.warn', 'battery.urgent', 'battery.docked', 'battery.undocked', 'battery.charging.start', 'battery.charging.stop', 'battery.locked', 'battery.unlocked']);
   let skippedFirstModeAnnouncement = false;
 
@@ -17,6 +17,118 @@ function createBusEventHandler(deps) {
     return embed;
   }
 
+  function formatVoltage(voltageMv) {
+    if (voltageMv == null) return 'n/a';
+    return `${(voltageMv / 1000).toFixed(2)}V`;
+  }
+
+  function formatCurrent(currentMa) {
+    if (currentMa == null) return 'n/a';
+    return `${currentMa}mA`;
+  }
+
+  function formatChargeState(batteryState) {
+    if (!batteryState) return 'n/a';
+    const charge = batteryState.charge;
+    const capacity = batteryState.capacity;
+    const percent = batteryState.percentDisplay;
+    const chargeText = charge != null && capacity != null ? `${charge}/${capacity}mAh` : 'n/a';
+    const percentText = percent != null ? `${percent}%` : 'n/a';
+    return `${chargeText} (${percentText})`;
+  }
+
+  function formatDockEmoji(docked) { return docked ? '🏠' : '🧭'; }
+  function formatChargeEmoji(charging) { return charging ? '⚡' : '🔌'; }
+  function formatLockEmoji(locked) { return locked ? '🔒' : '🔓'; }
+  function formatBatteryEmoji(batteryState) {
+    if (batteryState?.urgentActive) return '🛑';
+    if (batteryState?.warnActive) return '⚠️';
+    return '🔋';
+  }
+
+  function isCharging(sensors) {
+    const label = sensors?.chargingState?.label?.toLowerCase();
+    const chargingByLabel = label === 'waiting' || label === 'full charging' || label === 'trickle charging';
+    const code = sensors?.chargingState?.code;
+    const chargingByCode = code === 2 || code === 3 || code === 4;
+    return chargingByLabel || chargingByCode;
+  }
+
+  function buildRoverStatusSnapshot(record) {
+    if (!record) return null;
+    const sensors = record.lastSensor?.decoded || record.lastSensor?.sensors || null;
+    return {
+      id: record.id,
+      name: record.meta?.name || record.id,
+      locked: record.locked,
+      lockReason: record.lockReason,
+      docked: Boolean(sensors?.chargingSources?.homeBase),
+      charging: isCharging(sensors),
+      chargingLabel: sensors?.chargingState?.label || 'unknown',
+      voltageMv: sensors?.voltageMv ?? null,
+      currentMa: sensors?.currentMa ?? null,
+      batteryState: record.batteryState,
+    };
+  }
+
+  function buildBatteryStatusEmbed(color, records = null) {
+    const embed = buildEmbed({ title: 'Rover Battery Status', color: color || 0x2196f3 });
+    const sourceRecords = records || Array.from(rovers.values());
+    const snapshots = sourceRecords.map((entry) => buildRoverStatusSnapshot(entry)).filter(Boolean);
+    if (!snapshots.length) {
+      embed.setDescription('No rovers online.');
+      return embed;
+    }
+    snapshots.forEach((snapshot) => {
+      const lockLabel = snapshot.locked ? `locked${snapshot.lockReason ? ` (${snapshot.lockReason})` : ''}` : 'unlocked';
+      const dockLabel = snapshot.docked ? 'docked' : 'undocked';
+      const chargingLabel = snapshot.charging ? `charging (${snapshot.chargingLabel})` : 'not charging';
+      const header = [
+        formatBatteryEmoji(snapshot.batteryState),
+        formatDockEmoji(snapshot.docked),
+        formatChargeEmoji(snapshot.charging),
+        formatLockEmoji(snapshot.locked),
+      ].join(' ');
+      embed.addFields({
+        name: `${header} ${snapshot.name}`,
+        value: [
+          `Dock: ${dockLabel}`,
+          `Charging: ${chargingLabel}`,
+          `Battery: ${formatChargeState(snapshot.batteryState)}`,
+          `Voltage: ${formatVoltage(snapshot.voltageMv)}`,
+          `Current: ${formatCurrent(snapshot.currentMa)}`,
+          `Lock: ${lockLabel}`,
+        ].join('\n'),
+        inline: true,
+      });
+    });
+    return embed;
+  }
+
+  function buildBatteryCaption(type, payload) {
+    const roverId = payload?.roverId || 'unknown';
+    const record = rovers.get(roverId) || null;
+    const snapshot = buildRoverStatusSnapshot(record);
+    const base = snapshot?.name || roverId;
+    const percent = snapshot?.batteryState?.percentDisplay;
+    const percentLabel = percent != null ? `${percent}%` : 'n/a';
+    const dockLabel = snapshot?.docked ? 'docked' : 'undocked';
+    const chargingLabel = snapshot?.charging ? 'charging' : 'not charging';
+    const detail = `${dockLabel}, ${chargingLabel}, ${formatVoltage(snapshot?.voltageMv ?? null)}, ${formatCurrent(snapshot?.currentMa ?? null)}, ${formatChargeState(snapshot?.batteryState ?? null)}`;
+
+    switch (type) {
+      case 'battery.warn': return `Battery warn: ${base} at ${percentLabel}. ${detail}`;
+      case 'battery.urgent': return `Battery urgent: ${base} at ${percentLabel}. ${detail}`;
+      case 'battery.docked': return `Docked: ${base}. ${detail}`;
+      case 'battery.undocked': return `Undocked: ${base}. ${detail}`;
+      case 'battery.charging.start': return `Charging started: ${base}. ${detail}`;
+      case 'battery.charging.stop': return `Charging stopped: ${base}. ${detail}`;
+      case 'battery.locked': return `Locked for charging: ${base}. ${detail}`;
+      case 'battery.unlocked': return `Unlocked after charging: ${base}. ${detail}`;
+      default: return `Battery update: ${base}. ${detail}`;
+    }
+  }
+
   async function announce({ channelId, content, pingRoleId, color, title, description, embeds, files }) {
     if (!channelId) return;
     const prefix = pingRoleId ? `<@&${pingRoleId}> ` : '';
@@ -52,6 +164,24 @@ function createBusEventHandler(deps) {
       case 'rover.dockGuard':
         announce({ channelId: channels.adminAlerts, color: 0xf0b651, title: 'Dock Guard Triggered', description: `${payload?.roverId} (${payload?.reasonText || 'undocked'}) for ${formatDuration(payload?.idleMs)}.` });
         break;
+      case 'battery.warn':
+        announce({ channelId: channels.adminAlerts, pingRoleId: roles.adminPing || null, color: 0xf0b651, content: buildBatteryCaption(type, payload), embeds: [buildBatteryStatusEmbed(0xf0b651, Array.from(rovers.values()))] });
+        break;
+      case 'battery.urgent':
+        announce({ channelId: channels.adminAlerts, pingRoleId: roles.adminPing || null, color: 0xe53935, content: buildBatteryCaption(type, payload), embeds: [buildBatteryStatusEmbed(0xe53935, Array.from(rovers.values()))] });
+        break;
+      case 'battery.docked':
+      case 'battery.undocked':
+      case 'battery.charging.start':
+        announce({ channelId: channels.adminAlerts, color: 0x2196f3, content: buildBatteryCaption(type, payload), embeds: [buildBatteryStatusEmbed(0x2196f3, Array.from(rovers.values()))] });
+        break;
+      case 'battery.charging.stop':
+      case 'battery.locked':
+        announce({ channelId: channels.adminAlerts, color: 0xf0b651, content: buildBatteryCaption(type, payload), embeds: [buildBatteryStatusEmbed(0xf0b651, Array.from(rovers.values()))] });
+        break;
+      case 'battery.unlocked':
+        announce({ channelId: channels.adminAlerts, color: 0x4caf50, content: buildBatteryCaption(type, payload), embeds: [buildBatteryStatusEmbed(0x4caf50, Array.from(rovers.values()))] });
+        break;
       case 'humanAlert.buttonPressed': {
         const imageBase64 = payload?.imageBase64 ? String(payload.imageBase64) : '';
         let attachment = null;