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

package/README.md

@@ -183,6 +183,7 @@ With a plugin, you can see if it supports Real Time events, by opening the Home
 ### Dec 15, 2024 - Version 0.2.0
 
 - Major code base refresh, and migration from hap-node-client to hap-client ( Potential fix for #120 )
+- With the change in connectivity to homebridge, please validate all your nodes are connected after the update.  And pay particular attention to `Camera` nodes, as for some devices the name has changed.
 - Testing and Development was completed on Node-RED version: v4.0.2 and Node.js  version: v20.18.1
 
 # Backlog / Roadmap

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-homebridge-automation",
-  "version": "0.1.12-beta.40",
+  "version": "0.1.12-beta.42",
   "description": "NodeRED Automation for HomeBridge",
   "main": "src/HAP-NodeRed.js",
   "scripts": {

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

@@ -76,7 +76,6 @@ class HBConfigNode {
         this.hbDevices.push(updatedService);
       }
     });
-
     this.evDevices = this.toList({ perms: 'ev' });
     this.ctDevices = this.toList({ perms: 'pw' });
     this.log(`Devices initialized: evDevices: ${this.evDevices.length}, ctDevices: ${this.ctDevices.length}`);
@@ -92,7 +91,6 @@ class HBConfigNode {
       'Outlet', 'Smoke Sensor', 'Speaker', 'Stateless Programmable Switch', 'Switch',
       'Television', 'Temperature Sensor', 'Thermostat', 'Contact Sensor',
     ]);
-
     return filterUnique(this.hbDevices)
       .filter(service => supportedTypes.has(service.humanType))
       .map(service => ({
@@ -144,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}`);
       }
@@ -158,7 +156,7 @@ class HBConfigNode {
       const uniqueDevices = new Set();
 
       const monitorNodes = Object.values(this.clientNodes)
-        .filter(node => ['hb-status', 'hb-control'].includes(node.type)) // Filter by type
+        .filter(node => ['hb-status', 'hb-control', 'hb-event', 'hb-resume'].includes(node.type)) // Filter by type
         .filter(node => {
           if (uniqueDevices.has(node.device)) {
             return false; // Exclude duplicates
@@ -176,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));
         });
       });
@@ -230,7 +229,7 @@ class HBConfigNode {
 const filterUnique = (data) => {
   const seen = new Set();
   return data.filter(item => {
-    const uniqueKey = `${item.aid}-${item.serviceName}-${item.instance.username}-${item.instance.port}`;
+    const uniqueKey = `${item.aid}-${item.serviceName}-${item.humanType}-${item.instance.username}-${item.instance.port}`;
     if (seen.has(uniqueKey)) return false;
     seen.add(uniqueKey);
     return true;