signalk-automation-plugin 0.0.2 → 0.0.4

package/README.md

@@ -11,7 +11,7 @@ Not Node-RED. Not a Home Assistant YAML clone. Actions are Signal K PUTs, helper
   - `restore` — survive reboot (save in plugin data, restore on start)
   - `default` — set `default` on every start
   - `none` — do nothing on start
-- Path triggers, `choose`, zones, cron `schedule`
+- Path triggers, `choose`, zones, cron `schedule` (trigger list is **any**; conditions are **all**)
 - Trigger `round:` quantizes numbers (and lat/lon) so 230.1 V and 230.4 V do not both fire
 - Actions: `put`, `helper`, `notify`, `delay`, `run`
 - `run:` executes a file under configured `scriptsDir`. **stdout is the value; any stderr is fail**

package/lib/engine.js

@@ -69,7 +69,7 @@ function evalClause (clause, ctx) {
     }
   }
   if (Array.isArray(clause.all)) {
-    const parts = clause.all.map((c) => evalClause(c, ctx))
+    const parts = clause.all.map((c) => withLabel(c, evalClause(c, ctx)))
     return {
       pass: parts.every((p) => p.pass),
       error: parts.find((p) => p.error)?.error || null,
@@ -78,10 +78,11 @@ function evalClause (clause, ctx) {
     }
   }
   if (Array.isArray(clause.any)) {
-    const parts = clause.any.map((c) => evalClause(c, ctx))
+    const parts = clause.any.map((c) => withLabel(c, evalClause(c, ctx)))
+    const pass = parts.some((p) => p.pass)
     return {
-      pass: parts.some((p) => p.pass),
-      error: parts.find((p) => p.error)?.error || null,
+      pass,
+      error: pass ? null : (parts.find((p) => p.error)?.error || null),
       actual: parts,
       clause: { any: true }
     }
@@ -131,6 +132,18 @@ function evalClause (clause, ctx) {
     return { pass: false, error: 'clause needs path, helper, zone, or run', actual: null }
   }
   const actual = getByPath(ctx.values, path)
+  const needsValue = ['is', 'equals', 'above', 'below', 'to'].some((k) =>
+    Object.prototype.hasOwnProperty.call(clause, k)
+  )
+  if (needsValue && (actual === undefined || actual === null)) {
+    return {
+      pass: false,
+      error: 'missing',
+      actual,
+      path,
+      expected: expectedOf(clause)
+    }
+  }
   let pass = false
   if (Object.prototype.hasOwnProperty.call(clause, 'is')) {
     pass = actual === clause.is
@@ -228,10 +241,20 @@ function clauseLabel (clause, result) {
 
 function markPass (r) {
   if (!r) return '✗'
-  if (r.error) return '✗'
+  if (r.error && !r.pass) return '✗'
   return r.pass ? '✓' : '✗'
 }
 
+function appendClauseLines (lines, r, indent) {
+  if (!r) return
+  lines.push(indent + markPass(r) + ' ' + (r.label || ''))
+  const inner = r.clause && (r.clause.any || r.clause.all)
+  if (!inner || !Array.isArray(r.actual)) return
+  for (const part of r.actual) {
+    appendClauseLines(lines, part, indent + '  ')
+  }
+}
+
 function withLabel (clause, result) {
   const row = result && typeof result === 'object' ? result : { pass: false }
   row.clause = clause
@@ -255,6 +278,11 @@ function isBarePathClause (clause) {
   )
 }
 
+function triggerListMatched (list, results) {
+  if (!(list || []).length) return true
+  return (results || []).some((r) => r.pass && !r.error)
+}
+
 async function evalList (list, ctx) {
   const results = []
   for (const clause of list || []) {
@@ -274,9 +302,13 @@ async function evalListAll (list, ctx) {
   return { pass, results }
 }
 
+function resultLabel (result) {
+  return result === 'failure' ? 'Failed' : 'OK'
+}
+
 function formatVerboseLog (auto, record) {
   const name = (auto && (auto.alias || auto.id)) || (record && record.id) || 'automation'
-  const result = record.result || 'skipped'
+  const result = resultLabel(record.result)
   const head = name + ' → ' + result + (record.reason ? ' (' + record.reason + ')' : '')
   const lines = [head]
   if (record.firedBy) lines.push('  trigger: ' + record.firedBy)
@@ -292,7 +324,7 @@ function formatVerboseLog (auto, record) {
   for (const b of record.branches || []) {
     lines.push('  ' + (b.picked ? '→ ' : '  ') + b.alias + (b.picked ? '' : ''))
     for (const c of b.conditions || []) {
-      lines.push('    ' + markPass(c) + ' ' + (c.label || ''))
+      appendClauseLines(lines, c, '    ')
     }
   }
   return lines.join('\n')
@@ -387,7 +419,7 @@ async function evaluateAutomation (auto, ctx) {
   const record = {
     ts: new Date(ctx.now || Date.now()).toISOString(),
     id: auto.id,
-    result: 'skipped',
+    result: 'ok',
     trigger: ctx.trigger || null,
     firedBy: triggerFiredLabel(ctx.trigger),
     conditions: [],
@@ -402,7 +434,7 @@ async function evaluateAutomation (auto, ctx) {
 
   const trig = await evalListAll(auto.trigger || [], ctx)
   record.triggerResults = trig.results
-  if ((auto.trigger || []).length && !trig.pass) {
+  if (!triggerListMatched(auto.trigger, trig.results)) {
     record.reason = 'trigger not matched'
     return finishRecord(auto, record)
   }
@@ -411,7 +443,7 @@ async function evaluateAutomation (auto, ctx) {
   record.conditions = cond.results
   if ((auto.condition || []).length && !cond.pass) {
     const failed = cond.results.find((r) => r.error)
-    record.result = failed ? 'failure' : 'skipped'
+    record.result = failed ? 'failure' : 'ok'
     record.reason = failed ? failed.error : 'condition not met'
     return finishRecord(auto, record)
   }
@@ -436,6 +468,7 @@ async function evaluateAutomation (auto, ctx) {
       record.branches.push(row)
     }
     if (!picked) {
+      record.result = 'ok'
       record.reason = 'no matching choose branch'
       return finishRecord(auto, record)
     }
@@ -561,5 +594,6 @@ module.exports = {
   sameValue,
   clauseLabel,
   triggerFiredLabel,
+  triggerListMatched,
   formatVerboseLog
 }

package/lib/runtime.js

@@ -135,17 +135,24 @@ class Runtime {
   }
 
   async handlePathChange (p, value, source) {
+    const previous = Object.prototype.hasOwnProperty.call(this.values, p)
+      ? this.values[p]
+      : undefined
     this.setPathValue(p, value, { $source: source })
-    await this.applyLatches(p, source)
+    await this.applyLatches(p, source, previous)
     await this.kickPath(p, value)
   }
 
-  async applyLatches (p, source) {
+  async applyLatches (p, source, previous) {
     const fromSelf = source && String(source).includes(this.pluginId)
     if (fromSelf) return
+    if (previous === undefined) return
+    const next = this.values[p]
+    if (engine.sameValue(previous, next)) return
+    if (asSwitch(previous) !== null && asSwitch(previous) === asSwitch(next)) return
     for (const def of Object.values(this.doc.helpers)) {
       if (def.latch_on_external_put === p && def.type === 'boolean') {
-        if (this.values[p]) await this.setHelper(def.id, true)
+        await this.setHelper(def.id, true)
       }
     }
   }
@@ -166,8 +173,8 @@ class Runtime {
   async maybeRun (auto, trigger) {
     if (!this.isEnabled(auto)) return
     const ctx = this.makeCtx(trigger)
-    const trig = await engine.evalList(auto.trigger || [], ctx)
-    const matched = !(auto.trigger || []).length || trig.pass
+    const trig = await engine.evalListAll(auto.trigger || [], ctx)
+    const matched = engine.triggerListMatched(auto.trigger, trig.results)
 
     if (!matched) {
       this.lastTruthy[auto.id] = false
@@ -439,6 +446,12 @@ class Runtime {
   }
 }
 
+function asSwitch (v) {
+  if (v === true || v === 1 || v === '1' || v === 'on' || v === 'ON') return 1
+  if (v === false || v === 0 || v === '0' || v === 'off' || v === 'OFF') return 0
+  return null
+}
+
 function holdMs (auto) {
   for (const t of auto.trigger || []) {
     if (t.for) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "signalk-automation-plugin",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Home Assistant-like YAML automations for Signal K",
   "main": "plugin/index.js",
   "keywords": [

package/public/app.js

@@ -73,9 +73,15 @@ async function checkLogin () {
 
 function el (id) { return document.getElementById(id) }
 
+function displayResult (result) {
+  if (!result) return '—'
+  if (result === 'failure') return 'Failed'
+  return 'OK'
+}
+
 function badge (result) {
-  const r = result || '—'
-  return '<span class="badge ' + (result || '') + '">' + r + '</span>'
+  const klass = !result ? '' : result === 'failure' ? 'failure' : 'ok'
+  return '<span class="badge ' + klass + '">' + displayResult(result) + '</span>'
 }
 
 function fmtVal (v) {
@@ -135,7 +141,20 @@ function fmtRunRecord (t) {
 
 function fmtTime (iso) {
   if (!iso) return ''
-  try { return new Date(iso).toLocaleString() } catch (_) { return iso }
+  try {
+    const d = new Date(iso)
+    if (Number.isNaN(d.getTime())) return iso
+    return new Intl.DateTimeFormat('nl-NL', {
+      timeZone: 'Europe/Amsterdam',
+      year: 'numeric',
+      month: '2-digit',
+      day: '2-digit',
+      hour: '2-digit',
+      minute: '2-digit',
+      second: '2-digit',
+      hourCycle: 'h23'
+    }).format(d)
+  } catch (_) { return iso }
 }
 
 function escapeHtml (s) {

package/public/index.html

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>Signal K Automations</title>
     <link rel="icon" href="icon.png" />
-    <link rel="stylesheet" href="style.css?v=20260915log" />
+    <link rel="stylesheet" href="style.css?v=20260918ok" />
   </head>
   <body>
     <header>
@@ -61,6 +61,6 @@
         </div>
       </section>
     </main>
-    <script src="app.js?v=20260915log"></script>
+    <script src="app.js?v=20260918ok"></script>
   </body>
 </html>