mirror of
https://github.com/legop3/MultiRoombaRover.git
synced 2026-09-15 17:12:59 -04:00
loging
This commit is contained in:
@@ -80,7 +80,8 @@ function createButtonBoxCore(deps) {
|
||||
return Array.isArray(entities) ? entities : [];
|
||||
},
|
||||
getHomeAssistantLightPolicy: () => getHomeAssistantState()?.lightPolicy || null,
|
||||
setHomeAssistantEntityState,
|
||||
setHomeAssistantEntityState: (entityId, state) =>
|
||||
setHomeAssistantEntityState(entityId, state, { source: 'buttonBoxReward' }),
|
||||
setHomeAssistantLightsLockedOn: (next, options = {}) =>
|
||||
setHomeAssistantLightsLockedOn(next, options),
|
||||
saveEffect: (effectId, payload = {}) => saveEffect(effectId, payload, { broadcast: false }),
|
||||
|
||||
@@ -44,7 +44,7 @@ function registerHomeAssistantHooks(deps) {
|
||||
}
|
||||
try {
|
||||
if (!entityId) throw new Error('entityId required');
|
||||
await toggleEntity(entityId);
|
||||
await toggleEntity(entityId, { source: `socket:${socket.id}:homeAssistant:toggle` });
|
||||
cb({ success: true });
|
||||
} catch (err) {
|
||||
cb({ error: err.message });
|
||||
@@ -60,7 +60,7 @@ function registerHomeAssistantHooks(deps) {
|
||||
}
|
||||
try {
|
||||
if (!entityId) throw new Error('entityId required');
|
||||
await setEntityState(entityId, state);
|
||||
await setEntityState(entityId, state, { source: `socket:${socket.id}:homeAssistant:setState` });
|
||||
cb({ success: true });
|
||||
} catch (err) {
|
||||
cb({ error: err.message });
|
||||
|
||||
@@ -64,7 +64,7 @@ function createRuntimeEngine(deps) {
|
||||
return Array.from(entityConfig.values()).map((meta) => String(meta.id));
|
||||
}
|
||||
|
||||
async function setEntityState(entityId, desiredState) {
|
||||
async function setEntityState(entityId, desiredState, options = {}) {
|
||||
if (!enabled) throw new Error('Home Assistant not configured');
|
||||
const meta = entityConfig.get(entityId);
|
||||
if (!meta) throw new Error('Unknown Home Assistant entity');
|
||||
@@ -73,14 +73,23 @@ function createRuntimeEngine(deps) {
|
||||
const nextState = desiredState === 'on' ? 'on' : 'off';
|
||||
const domain = meta.type === 'light' ? 'light' : 'switch';
|
||||
const service = nextState === 'on' ? 'turn_on' : 'turn_off';
|
||||
const source = String(options?.source || 'unknown');
|
||||
await callHomeAssistantService(domain, service, { entity_id: entityId });
|
||||
logger.info('Issued Home Assistant command', { entityId, domain, service });
|
||||
logger.info('Issued Home Assistant command', { entityId, domain, service, source });
|
||||
}
|
||||
|
||||
async function setAllControllableEntitiesState(desiredState) {
|
||||
async function setAllControllableEntitiesState(desiredState, options = {}) {
|
||||
const source = String(options?.source || 'unknown');
|
||||
const ids = getControllableEntityIds();
|
||||
if (!ids.length) return;
|
||||
const results = await Promise.allSettled(ids.map((id) => setEntityState(id, desiredState)));
|
||||
logger.info('Issuing Home Assistant bulk state update', {
|
||||
desiredState: desiredState === 'on' ? 'on' : 'off',
|
||||
source,
|
||||
total: ids.length,
|
||||
});
|
||||
const results = await Promise.allSettled(
|
||||
ids.map((id) => setEntityState(id, desiredState, { source: `${source}:bulk` })),
|
||||
);
|
||||
const failures = results.filter((result) => result.status === 'rejected');
|
||||
if (failures.length) {
|
||||
logger.warn('Some Home Assistant entity state updates failed', {
|
||||
@@ -200,10 +209,11 @@ function createRuntimeEngine(deps) {
|
||||
evaluateTriggers(snapshot);
|
||||
}
|
||||
|
||||
async function toggleEntity(entityId) {
|
||||
async function toggleEntity(entityId, options = {}) {
|
||||
const current = entityState.get(entityId);
|
||||
const nextState = current?.state === 'on' ? 'off' : 'on';
|
||||
return setEntityState(entityId, nextState);
|
||||
const source = String(options?.source || 'homeAssistant:toggleEntity');
|
||||
return setEntityState(entityId, nextState, { source });
|
||||
}
|
||||
|
||||
async function setLightColor(entityId, rgbColor) {
|
||||
@@ -250,7 +260,9 @@ function createRuntimeEngine(deps) {
|
||||
|
||||
if (runtime.lightsLockState != null) {
|
||||
if ((changed || forceApply) && enabled) {
|
||||
await setAllControllableEntitiesState(runtime.lightsLockState);
|
||||
await setAllControllableEntitiesState(runtime.lightsLockState, {
|
||||
source: String(options?.source || 'homeAssistant:setLightsLockedOn'),
|
||||
});
|
||||
}
|
||||
} else {
|
||||
evaluateLightAutomation();
|
||||
|
||||
@@ -13,7 +13,7 @@ const {
|
||||
} = require('./constants');
|
||||
|
||||
async function turnOffRoomControls() {
|
||||
await homeAssistantService.setAllControllableEntitiesState('off');
|
||||
await homeAssistantService.setAllControllableEntitiesState('off', { source: 'idleService:turnOffRoomControls' });
|
||||
return { action: 'roomControlsOff' };
|
||||
}
|
||||
|
||||
|
||||
@@ -31,6 +31,7 @@ const state = {
|
||||
lastActor: null,
|
||||
lastError: null,
|
||||
};
|
||||
let lastEmittedStateJson = null;
|
||||
|
||||
function sleep(ms) {
|
||||
return new Promise((resolve) => setTimeout(resolve, ms));
|
||||
@@ -92,7 +93,11 @@ function getState() {
|
||||
}
|
||||
|
||||
function emitUpdate() {
|
||||
events.emit('update', getState());
|
||||
const next = getState();
|
||||
const nextJson = JSON.stringify(next);
|
||||
if (nextJson === lastEmittedStateJson) return;
|
||||
lastEmittedStateJson = nextJson;
|
||||
events.emit('update', next);
|
||||
}
|
||||
|
||||
function assertReady() {
|
||||
|
||||
Reference in New Issue
Block a user