legop3/MultiRoombaRover
1
0
Fork 0
mirror of https://github.com/legop3/MultiRoombaRover.git synced 2026-09-16 01:21:20 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

guh

Browse Source
This commit is contained in:
legop3
2026-04-09 16:36:07 -04:00
parent 353efeeffd
commit 7aa648240c
1 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/services/homeAssistantService.js
+31 -10
View File
@@ -22,6 +22,7 @@ const entityState = new Map(); // entityId -> normalized state
const triggerConfig = []; // [{ runtimeKey, source, entityId?, eventType?, eventData?, action, stateEquals, payload, cooldownMs, allowedModes }] const triggerConfig = []; // [{ runtimeKey, source, entityId?, eventType?, eventData?, action, stateEquals, payload, cooldownMs, allowedModes }]
const triggerRuntime = new Map(); // triggerId -> { lastFiredAt, lastState, lastChanged, lastUpdated } const triggerRuntime = new Map(); // triggerId -> { lastFiredAt, lastState, lastChanged, lastUpdated }
const HA_BUTTON_EVENT_TYPE = 'ha.button.action'; const HA_BUTTON_EVENT_TYPE = 'ha.button.action';
const MQTT_EVENT_TYPES = new Set(['mqtt', 'mqtt_message', 'mqtt_message_received']);
let connection = null; let connection = null;
let unsubscribeEntities = null; let unsubscribeEntities = null;
@@ -88,7 +89,7 @@ function normalizeTriggerEntry(entry, index) {
const action = String(entry.action || '').trim(); const action = String(entry.action || '').trim();
if (!action) return null; if (!action) return null;
const entityId = String(entry.entityId || entry.entity_id || '').trim(); const entityId = String(entry.entityId || entry.entity_id || '').trim();
const eventType = String(entry.eventType || entry.event_type || '').trim(); const eventType = String(entry.eventType || entry.event_type || '').trim().toLowerCase();
let source = null; let source = null;
if (entityId) source = 'entity'; if (entityId) source = 'entity';
if (!source && eventType) source = 'event'; if (!source && eventType) source = 'event';
@@ -119,6 +120,15 @@ function normalizeTriggerEntry(entry, index) {
}; };
} }
function eventTypeMatches(expected, actual) {
const exp = String(expected || '').trim().toLowerCase();
const act = String(actual || '').trim().toLowerCase();
if (!exp || !act) return false;
if (exp === act) return true;
if (exp === 'mqtt' && MQTT_EVENT_TYPES.has(act)) return true;
return false;
}
function loadTriggerConfig() { function loadTriggerConfig() {
triggerConfig.length = 0; triggerConfig.length = 0;
const list = Array.isArray(haConfig?.buttons) ? haConfig.buttons : []; const list = Array.isArray(haConfig?.buttons) ? haConfig.buttons : [];
@@ -297,11 +307,11 @@ function evaluateTriggers(snapshot = {}) {
function handleHomeAssistantEvent(event = {}) { function handleHomeAssistantEvent(event = {}) {
if (!triggerConfig.length) return; if (!triggerConfig.length) return;
const eventType = String(event?.event_type || '').trim(); const eventType = String(event?.event_type || '').trim().toLowerCase();
if (!eventType) return; if (!eventType) return;
triggerConfig.forEach((trigger) => { triggerConfig.forEach((trigger) => {
if (trigger.source !== 'event') return; if (trigger.source !== 'event') return;
if (trigger.eventType !== eventType) return; if (!eventTypeMatches(trigger.eventType, eventType)) return;
if (trigger.eventData && !objectContainsSubset(event?.data || {}, trigger.eventData)) return; if (trigger.eventData && !objectContainsSubset(event?.data || {}, trigger.eventData)) return;
const runtimeState = triggerRuntime.get(trigger.runtimeKey) || { const runtimeState = triggerRuntime.get(trigger.runtimeKey) || {
lastFiredAt: 0, lastFiredAt: 0,
@@ -377,19 +387,30 @@ async function connect() {
new Set( new Set(
triggerConfig triggerConfig
.filter((trigger) => trigger.source === 'event' && trigger.eventType) .filter((trigger) => trigger.source === 'event' && trigger.eventType)
.map((trigger) => trigger.eventType), .map((trigger) => String(trigger.eventType).toLowerCase()),
), ),
); );
for (const eventType of eventTypes) { const hasMqttTrigger = eventTypes.some((type) => type === 'mqtt' || MQTT_EVENT_TYPES.has(type));
if (hasMqttTrigger) {
try { try {
const unsubscribe = await connection.subscribeEvents(handleHomeAssistantEvent, eventType); const unsubscribe = await connection.subscribeEvents(handleHomeAssistantEvent);
eventUnsubscribers.push(unsubscribe); eventUnsubscribers.push(unsubscribe);
logger.info('Subscribed Home Assistant event stream (all events) for MQTT button matching');
} catch (err) { } catch (err) {
logger.warn('Failed to subscribe Home Assistant event stream', { eventType, error: err.message }); logger.warn('Failed to subscribe Home Assistant all-event stream', { error: err.message });
}
} else {
for (const eventType of eventTypes) {
try {
const unsubscribe = await connection.subscribeEvents(handleHomeAssistantEvent, eventType);
eventUnsubscribers.push(unsubscribe);
} catch (err) {
logger.warn('Failed to subscribe Home Assistant event stream', { eventType, error: err.message });
}
}
if (eventTypes.length) {
logger.info('Subscribed Home Assistant event streams', { count: eventTypes.length, eventTypes });
} }
}
if (eventTypes.length) {
logger.info('Subscribed Home Assistant event streams', { count: eventTypes.length, eventTypes });
} }
connection.addEventListener('disconnected', () => { connection.addEventListener('disconnected', () => {
logger.warn('Home Assistant connection lost'); logger.warn('Home Assistant connection lost');