node-red-contrib-homebridge-automation 0.1.12-beta.40 → 0.1.12-beta.42

package/src/hbControlNode.js

@@ -7,7 +7,7 @@ class HbControlNode extends hbBaseNode {
   }
 
   async handleInput(message, send, done) {
-    debug('handleInput', message.payload, this.name);
+    debug('handleInput', this.name, JSON.stringify(message.payload));
 
     if (!this.hbDevice) {
       this.handleWarning('HB not initialized');

package/src/hbResumeNode.js

@@ -4,12 +4,21 @@ const debug = require('debug')('hapNodeRed:hbResumeNode');
 class HbResumeNode extends HbBaseNode {
   constructor(config, RED) {
     super(config, RED);
-
+    this.lastOutputTime = Date.now();
     this.storedState = null;
   }
 
+  handleHBEventMessage(service) {
+    debug('hbEvent for', this.id, service.serviceName, JSON.stringify(service.values));
+
+    if (service.values && Date.now() - this.lastOutputTime > 1000) {    // Ignore messages within 1 second of last output
+      this.storedState = JSON.parse(JSON.stringify(this.hbDevice.values));
+      debug('Storing state', this.name, JSON.stringify(this.storedState));
+    }
+  }
+
   handleInput(message, send) {
-    debug('handleInput', message.payload, this.name);
+    debug('handleInput', this.id, message.payload, this.name);
 
     if (!this.hbDevice) {
       this.handleWarning('HB not initialized');
@@ -32,10 +41,10 @@ class HbResumeNode extends HbBaseNode {
 
     if (message.payload.On) {
       this.storedState = JSON.parse(JSON.stringify(this.hbDevice.values));
-      debug('Storing state', this.storedState);
+      debug('Storing state', this.name, JSON.stringify(this.storedState));
     } else if (this.storedState) {
-      debug('Restoring state', this.storedState);
-      message.payload = { ...this.storedState, ...message.payload };
+      debug('Restoring state', this.name, JSON.stringify(this.storedState));
+      message.payload = { ...message.payload, ...this.storedState };
       this.storedState = null;
     }
 
@@ -45,6 +54,7 @@ class HbResumeNode extends HbBaseNode {
       fill: 'green',
     });
 
+    this.lastOutputTime = Date.now();;
     send(message);
   }
 

package/test/node-red/.config.users.json

@@ -15,6 +15,9 @@
             "tours": {
                 "welcome": "4.0.2"
             }
+        },
+        "debug": {
+            "filter": "filterCurrent"
         }
     }
 }

package/test/node-red/.config.users.json.backup

@@ -11,6 +11,9 @@
                 "view-node-show-label": true,
                 "view-show-tips": true,
                 "view-show-welcome-tours": true
+            },
+            "tours": {
+                "welcome": "4.0.2"
             }
         }
     }