signalk-automation-plugin 0.0.7 → 0.0.9

package/lib/engine.js

@@ -579,7 +579,7 @@ async function runAction (action, ctx) {
   }
   if (action.delay != null) {
     const ms = parseDuration(action.delay)
-    if (ctx.skipDelay) return { ok: true, type: 'delay', ms, skipped: true, stop: true }
+    if (ctx.skipDelay) return { ok: true, type: 'delay', ms, skipped: true }
     try {
       await ctx.sleep(ms)
     } catch (err) {

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/package.json

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