signalk-automation-plugin 0.0.6 → 0.0.8

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/runtime.js

@@ -21,6 +21,7 @@ class Runtime {
     this.sleep = opts.sleep || ((ms) => new Promise((r) => setTimeout(r, ms)))
     this.putFn = opts.put
     this.notifyFn = opts.notify
+    this.onHelper = opts.onHelper || null
     this.log = opts.log || { debug () {}, error () {} }
 
     this.doc = yaml.emptyDoc()
@@ -90,11 +91,20 @@ class Runtime {
         to: coerced,
         changed: true
       })
+      this.emitHelperValue(id, coerced)
       if (!opts || opts.kick !== false) {
         await this.kickPath(helpers.helperPath(id), coerced)
       }
     }
-    return coerced
+    const current = Object.prototype.hasOwnProperty.call(this.helperValues, id)
+      ? this.helperValues[id]
+      : coerced
+    if (!engine.sameValue(current, coerced)) this.emitHelperValue(id, current)
+    return current
+  }
+
+  emitHelperValue (id, value) {
+    if (typeof this.onHelper === 'function') this.onHelper(id, value)
   }
 
   async resetHelper (id) {

package/package.json

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

package/plugin/index.js

@@ -426,6 +426,7 @@ module.exports = function (app) {
       scriptTimeoutSeconds: options.scriptTimeoutSeconds,
       put: putPath,
       notify,
+      onHelper: (id, value) => emitHelper(id, value),
       log: {
         debug: app.debug ? app.debug.bind(app) : () => {},
         error: app.error ? app.error.bind(app) : console.error,
@@ -461,7 +462,10 @@ module.exports = function (app) {
         app.registerPutHandler('vessels.self', helpers.helperPath(id), (context, p, v, cb) => {
           Promise.resolve(runtime.setHelper(id, v))
             .then((next) => {
-              emitHelper(id, next)
+              const live = Object.prototype.hasOwnProperty.call(runtime.helperValues, id)
+                ? runtime.helperValues[id]
+                : next
+              emitHelper(id, live)
               if (cb) cb({ state: 'COMPLETED' })
             })
             .catch((err) => {