node-red-contrib-homebridge-automation 0.1.12-beta.41 → 0.1.12-beta.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-homebridge-automation",
-  "version": "0.1.12-beta.41",
+  "version": "0.1.12-beta.43",
   "description": "NodeRED Automation for HomeBridge",
   "main": "src/HAP-NodeRed.js",
   "scripts": {
@@ -26,23 +26,23 @@
   },
   "devDependencies": {
     "@types/node-red": "^1.3.5",
-    "@types/jest": "^29.5.12",
-    "@eslint/js": "^9.14.0",
+    "@types/jest": "^29.5.14",
+    "@eslint/js": "^9.16.0",
     "eslint": "^8.57.1",
     "eslint-plugin-format": "^0.1.2",
     "eslint-plugin-jest": "^28.8.3",
-    "globals": "^15.12.0",
+    "globals": "^15.13.0",
     "jest": "^29.7.0",
     "node-red": "^4.0.2",
     "node-red-node-test-helper": "^0.3.4",
-    "nodemon": "^3.1.4",
+    "nodemon": "^3.1.7",
     "rimraf": "^6.0.1",
-    "semver": "^7.6.2"
+    "semver": "^7.6.3"
   },
   "dependencies": {
     "better-queue": ">=3.8.12",
-    "debug": "^4.3.5",
-    "@homebridge/hap-client": "2.0.5-beta.21"
+    "debug": "^4.3.7",
+    "@homebridge/hap-client": "^2.0.5"
   },
   "author": "NorthernMan54",
   "license": "ISC",

package/src/HAP-NodeRed.js

@@ -13,7 +13,7 @@ module.exports = function (RED) {
 
   class hbConfigNode extends HBConfigNode {
     constructor(config) {
-      debug('hbConfigNode', config);
+      debug('hbConfigNode', JSON.stringify(config));
       super(config, RED);
     }
   }
@@ -28,7 +28,6 @@ module.exports = function (RED) {
 
   class hbEventNode extends HbEventNode {
     constructor(config) {
-      debug('hbEventNode', config);
       super(config, RED);
     }
   }
@@ -37,7 +36,6 @@ module.exports = function (RED) {
 
   class hbResumeNode extends HbResumeNode {
     constructor(config) {
-      debug('hbResumeNode', config);
       super(config, RED);
     }
   }
@@ -46,7 +44,6 @@ module.exports = function (RED) {
 
   class hbControlNode extends HbControlNode {
     constructor(config) {
-      debug('hbControlNode', config);
       super(config, RED);
     }
   }
@@ -55,7 +52,6 @@ module.exports = function (RED) {
 
   class hbStatusNode extends HbStatusNode {
     constructor(config) {
-      debug('hbStatusNode', config);
       super(config, RED);
     }
   }

package/src/hbBaseNode.js

@@ -2,7 +2,7 @@ const debug = require('debug')('hapNodeRed:hbBaseNode');
 
 class HbBaseNode {
   constructor(config, RED) {
-    debug("Constructor:", config);
+    debug("Constructor:", config.type, JSON.stringify(config));
     RED.nodes.createNode(this, config);
 
     if (!config.conf) {
@@ -31,7 +31,7 @@ class HbBaseNode {
   }
 
   handleHBEventMessage(service) {
-    debug('hbEvent for', this.id, service.serviceName, service.values);
+    debug('hbEvent for', this.id, this.type, service.serviceName, JSON.stringify(service.values));
 
     this.status({
       text: JSON.stringify(service.values),

package/src/hbConfigNode.js

@@ -142,7 +142,7 @@ class HBConfigNode {
         clientNode.hbDevice = matchedDevice;
         clientNode.status({ fill: 'green', shape: 'dot', text: 'connected' });
         clientNode.emit('hbReady', matchedDevice);
-        debug('_Registered: %s type: %s', matchedDevice.type, matchedDevice.serviceName, matchedDevice.instance);
+        debug('_Registered: %s type: %s', clientNode.type, matchedDevice.type, matchedDevice.serviceName);
       } else {
         this.error(`ERROR: Device registration failed ${clientNode.name}`);
       }
@@ -174,6 +174,7 @@ class HBConfigNode {
           const eventNodes = Object.values(this.clientNodes).filter(clientNode =>
             clientNode.config.device === `${service.instance.name}${service.instance.username}${service.accessoryInformation.Manufacturer}${service.serviceName}${service.uuid.slice(0, 8)}`
           );
+          // debug('service-update', service.serviceName, eventNodes);
           eventNodes.forEach(eventNode => eventNode.emit('hbEvent', service));
         });
       });

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"
             }
         }
     }