signalk-automation-plugin 0.0.8 → 0.0.10

package/lib/engine.js

@@ -74,6 +74,23 @@ function evalClause (clause, ctx) {
       clause: { not: true }
     }
   }
+  if (clause.triggered) {
+    const want = clause.triggered
+    const fired = ctx.trigger && ctx.trigger.path
+    let expected = null
+    if (want && typeof want === 'object') {
+      if (want.helper) expected = helperPath(want.helper)
+      else if (want.path) expected = want.path
+    } else if (typeof want === 'string') {
+      expected = want
+    }
+    return {
+      pass: expected != null && fired === expected,
+      error: expected == null ? 'triggered needs helper or path' : null,
+      actual: fired || null,
+      expected
+    }
+  }
   if (Array.isArray(clause.all)) {
     const parts = clause.all.map((c) => withLabel(c, evalClause(c, ctx)))
     return {
@@ -212,6 +229,12 @@ function fmtVal (value) {
 function clauseLabel (clause, result) {
   if (!clause || typeof clause !== 'object') return ''
   if (clause.not) return 'not ' + clauseLabel(clause.not, result)
+  if (clause.triggered) {
+    const want = clause.triggered
+    if (want && want.helper) return 'triggered helper ' + want.helper
+    if (want && want.path) return 'triggered path ' + want.path
+    return 'triggered ' + fmtVal(want)
+  }
   if (Array.isArray(clause.all)) return 'all'
   if (Array.isArray(clause.any)) return 'any'
   if (clause.zone) {
@@ -636,6 +659,20 @@ function sameValue (a, b) {
   return false
 }
 
+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 valueUnchanged (previous, next) {
+  if (previous === undefined) return false
+  if (sameValue(previous, next)) return true
+  const a = asSwitch(previous)
+  const b = asSwitch(next)
+  return a !== null && a === b
+}
+
 function makeRunScript (opts) {
   return function (spec) {
     return runScript({
@@ -664,6 +701,8 @@ module.exports = {
   makeRunScript,
   parseDuration,
   sameValue,
+  asSwitch,
+  valueUnchanged,
   clauseLabel,
   triggerFiredLabel,
   triggerListMatched,

package/lib/git.js

@@ -46,9 +46,18 @@ function currentSha (dir) {
   }
 }
 
+function canonicalPath (p) {
+  const resolved = path.resolve(p)
+  try {
+    return fs.realpathSync(resolved)
+  } catch (_) {
+    return resolved
+  }
+}
+
 function repoRelPath (repoDir) {
-  const root = path.resolve(runGit(['rev-parse', '--show-toplevel'], repoDir))
-  const dir = path.resolve(repoDir)
+  const root = canonicalPath(runGit(['rev-parse', '--show-toplevel'], repoDir))
+  const dir = canonicalPath(repoDir)
   const rel = path.relative(root, dir).replace(/\\/g, '/')
   if (!rel || rel === '.') return { root, rel: '' }
   if (rel.startsWith('..') || path.isAbsolute(rel)) {
@@ -78,13 +87,8 @@ function diffRange (repoDir, fromSha, toSha) {
 }
 
 function archiveTreeish (repoDir, sha) {
-  const root = path.resolve(runGit(['rev-parse', '--show-toplevel'], repoDir))
-  const dir = path.resolve(repoDir)
-  const rel = path.relative(root, dir).replace(/\\/g, '/')
-  if (!rel || rel === '.') return sha
-  if (rel.startsWith('..') || path.isAbsolute(rel)) {
-    throw new Error('automationsDir is outside the git repository')
-  }
+  const { rel } = repoRelPath(repoDir)
+  if (!rel) return sha
   return sha + ':' + rel
 }
 
@@ -93,7 +97,7 @@ function materializeCommit (repoDir, sha, destDir) {
   if (!isGitRepo(repoDir)) throw new Error('automationsDir is not a git repository')
   runGit(['cat-file', '-t', sha], repoDir)
   const treeish = archiveTreeish(repoDir, sha)
-  const root = path.resolve(runGit(['rev-parse', '--show-toplevel'], repoDir))
+  const root = repoRelPath(repoDir).root
   const parent = path.dirname(path.resolve(destDir))
   fs.mkdirSync(parent, { recursive: true })
   const tmp = fs.mkdtempSync(path.join(parent, 'live-tmp-'))

package/lib/runtime.js

@@ -151,6 +151,7 @@ class Runtime {
       : undefined
     this.setPathValue(p, value, { $source: source })
     await this.applyLatches(p, source, previous)
+    if (engine.valueUnchanged(previous, value)) return
     await this.kickPath(p, value)
   }
 
@@ -159,8 +160,7 @@ class Runtime {
     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
+    if (engine.valueUnchanged(previous, next)) return
     for (const def of Object.values(this.doc.helpers)) {
       if (def.latch_on_external_put === p && def.type === 'boolean') {
         await this.setHelper(def.id, true)
@@ -507,12 +507,6 @@ function newAbort () {
   return abort
 }
 
-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.8",
+  "version": "0.0.10",
   "description": "Home Assistant-like YAML automations for Signal K",
   "main": "plugin/index.js",
   "keywords": [