ThaMunsta/dibby-wemo-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: countdown rule fires only when device matches configured condition

Browse Source 
Countdown is now state-change-driven (no scheduled window):
- 'If turns ON → auto-OFF after duration' (on_to_off)
- 'If turns OFF → auto-ON after duration' (off_to_on)
Scheduler polls device state; timer only starts when state matches
the chosen condition. Cancels any pending timer if state changes again.
Away Mode startAction/endAction already wired; _stopAwayLoop uses endAction.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
SRS IT
2026-03-28 22:24:11 -04:00
parent 5024996523
commit e52b3578dc
3 changed files with 67 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/homebridge-plugin/homebridge-ui/public/index.html
+3 -3
View File
@@ -399,10 +399,10 @@
<input type="number" id="dwm-countdown-mins" min="1" max="1440" placeholder="60" />
</div>
<div class="form-group">
<label>Action when timer fires</label>
<label>Condition</label>
<select id="dwm-countdown-action">
<option value="1">Turn ON</option>
<option value="0">Turn OFF</option>
<option value="on_to_off">If device turns ON → auto-OFF after duration</option>
<option value="off_to_on">If device turns OFF → auto-ON after duration</option>
</select>
</div>
</div>
packages/homebridge-plugin/homebridge-ui/public/index.js
+5 -5
View File
@@ -196,8 +196,8 @@ function dwmRuleSummary(r) {
}
if (r.type === 'Countdown') {
const mins = r.countdownTime ? Math.round(r.countdownTime / 60) : null;
const action = r.countdownAction === 0 ? 'Turn OFF' : 'Turn ON';
return mins ? `⏱ ${mins} min · ${action}` : '—';
const cond = r.countdownAction === 'off_to_on' ? 'OFF→ON' : 'ON→OFF';
return mins ? `⏱ ${mins} min · ${cond}` : '—';
}
const days = dayLabel(r.days);
const devs = (r.targetDevices ?? []).map((td) => esc(td.name ?? td.host)).join(', ') || 'no targets';
@@ -443,7 +443,7 @@ function openDwmEdit(id) {
document.getElementById('dwm-end-action').value = String(r.endAction ?? -1);
document.getElementById('dwm-countdown-mins').value =
r.countdownTime ? String(Math.round(r.countdownTime / 60)) : '';
document.getElementById('dwm-countdown-action').value = String(r.countdownAction ?? 1);
document.getElementById('dwm-countdown-action').value = r.countdownAction ?? 'on_to_off';
_selectedDwmDays = new Set((r.days ?? []).map(Number));
@@ -477,7 +477,7 @@ function openDwmEdit(id) {
document.getElementById('dwm-start-action').value = '1';
document.getElementById('dwm-end-action').value = '-1';
document.getElementById('dwm-countdown-mins').value = '';
document.getElementById('dwm-countdown-action').value = '1';
document.getElementById('dwm-countdown-action').value = 'on_to_off';
document.getElementById('dwm-trigger-src').value = '';
document.getElementById('dwm-trigger-event').value = 'any';
document.getElementById('dwm-trigger-action').value = 'on';
@@ -608,7 +608,7 @@ document.getElementById('dwm-form-save-btn').addEventListener('click', async ()
const mins = Number(document.getElementById('dwm-countdown-mins').value);
if (!mins || mins < 1) { showModalError('Enter countdown duration in minutes'); return; }
rule.countdownTime = mins * 60;
rule.countdownAction = Number(document.getElementById('dwm-countdown-action').value);
rule.countdownAction = document.getElementById('dwm-countdown-action').value;
} else {
const startType = document.getElementById('dwm-start-type').value;
const startOffset = parseInt(document.getElementById('dwm-start-offset').value ?? '0', 10) || 0;