signalk-automation-plugin 0.0.2 → 0.0.3

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

@@ -255,6 +255,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 || []) {
@@ -402,7 +407,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)
   }
@@ -561,5 +566,6 @@ module.exports = {
   sameValue,
   clauseLabel,
   triggerFiredLabel,
+  triggerListMatched,
   formatVerboseLog
 }

package/lib/runtime.js

@@ -166,8 +166,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

package/package.json

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

package/public/app.js

@@ -135,7 +135,17 @@ function fmtRunRecord (t) {
 
 function fmtTime (iso) {
   if (!iso) return ''
-  try { return new Date(iso).toLocaleString() } catch (_) { return iso }
+  try {
+    return new Date(iso).toLocaleString('nl-NL', {
+      year: 'numeric',
+      month: '2-digit',
+      day: '2-digit',
+      hour: '2-digit',
+      minute: '2-digit',
+      second: '2-digit',
+      hour12: false
+    })
+  } 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=20260915h24" />
   </head>
   <body>
     <header>
@@ -61,6 +61,6 @@
         </div>
       </section>
     </main>
-    <script src="app.js?v=20260915log"></script>
+    <script src="app.js?v=20260915h24"></script>
   </body>
 </html>