node-red-contrib-homebridge-automation 0.2.1-beta.1 → 0.2.1-beta.2

package/package.json

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

package/src/hbBaseNode.js

@@ -27,18 +27,9 @@ class HbBaseNode {
       this.on('hbReady', this.handleHbReady.bind(this))
     }
     this.on('close', this.handleClose.bind(this));
-    this.on('hbEvent', this.handleHBEventMessage.bind(this));
-  }
-
-  handleHBEventMessage(service) {
-    debug('hbEvent for', this.id, this.type, service.serviceName, JSON.stringify(service.values));
-
-    this.status({
-      text: JSON.stringify(service.values),
-      shape: 'dot',
-      fill: 'green',
-    });
-    this.send({ payload: service.values });
+    if (this.handleHBEventMessage) {
+      this.on('hbEvent', this.handleHBEventMessage.bind(this));
+    }
   }
 
   createMessage(service) {

package/src/hbConfigNode.js

@@ -137,21 +137,17 @@ class HBConfigNode {
 
   async monitorDevices() {
     if (Object.keys(this.clientNodes).length) {
-      const uniqueDevices = new Set();
 
       const monitorNodes = Object.values(this.clientNodes)
-        .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
-          }
-          uniqueDevices.add(node.device);
-          return true; // Include unique devices
-        })
+        .filter(node => ['hb-status', 'hb-event', 'hb-resume'].includes(node.type)) // Filter by type
         .map(node => node.hbDevice) // Map to hbDevice property
         .filter(Boolean); // Remove any undefined or null values, if present;
-      debug('monitorNodes', Object.keys(monitorNodes).length);
+      this.log(`Connected to ${Object.keys(monitorNodes).length} Homebridge devices`);
       // console.log('monitorNodes', monitorNodes);
+      if (this.monitor) {
+        // This is kinda brute force, but it works
+        this.monitor.finish();
+      }
       this.monitor = await this.hapClient.monitorCharacteristics(monitorNodes);
       this.monitor.on('service-update', (services) => {
         services.forEach(service => {

package/src/hbEventNode.js

@@ -18,6 +18,17 @@ class HbEventNode extends hbBaseNode {
       this.send({ ...this.createMessage(service) });
     }
   }
+
+  handleHBEventMessage(service) {
+    debug('hbEvent for', this.id, this.type, service.serviceName, JSON.stringify(service.values));
+
+    this.status({
+      text: JSON.stringify(service.values),
+      shape: 'dot',
+      fill: 'green',
+    });
+    this.send({ payload: service.values });
+  }
 }
 
 module.exports = HbEventNode;

package/src/hbStatusNode.js

@@ -32,6 +32,17 @@ class HbStatusNode extends HbBaseNode {
     }
 
   }
+
+  handleHBEventMessage(service) {
+    debug('hbEvent for', this.id, this.type, service.serviceName, JSON.stringify(service.values));
+
+    this.status({
+      text: JSON.stringify(service.values),
+      shape: 'dot',
+      fill: 'green',
+    });
+    this.send({ payload: service.values });
+  }
 }
 
 module.exports = HbStatusNode;

package/test/node-red/.flows.json.backup

@@ -180,7 +180,7 @@
         "conf": "7e647d67.f33acc",
         "outputs": 1,
         "x": 500,
-        "y": 300,
+        "y": 320,
         "wires": [
             [
                 "f194fc4bcb1997a9"
@@ -825,7 +825,7 @@
         "Manufacturer": "Tasmota",
         "Service": "Lightbulb",
         "device": "homebridge1C:22:3D:E3:CF:34TasmotaMaster00000043",
-        "conf": "557aec8e8c47e61e",
+        "conf": "7e647d67.f33acc",
         "sendInitialState": true,
         "x": 170,
         "y": 280,

package/test/node-red/flows.json

@@ -180,7 +180,7 @@
         "conf": "7e647d67.f33acc",
         "outputs": 1,
         "x": 500,
-        "y": 300,
+        "y": 320,
         "wires": [
             [
                 "f194fc4bcb1997a9"
@@ -453,7 +453,7 @@
         "statusVal": "payload",
         "statusType": "auto",
         "x": 800,
-        "y": 300,
+        "y": 320,
         "wires": []
     },
     {