node-red-contrib-homebridge-automation 0.1.12-beta.35 → 0.1.12-beta.37

package/package.json

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

package/src/hbConfigNode.js

@@ -40,6 +40,7 @@ class HBConfigNode {
   refreshDevices = () => {
     if (!this.refreshInProcess) {
 
+      this.monitor.finish();
       this.log.debug('Monitor reported homebridge stability issues, refreshing devices');
       this.hapClient.on('instance-discovered', this.waitForNoMoreDiscoveries);
       this.hapClient.resetInstancePool();
@@ -85,16 +86,16 @@ class HBConfigNode {
   }
 
   toList(perms) {
-    const supportedTypes = [
-      'Battery', 'Carbon Dioxide Sensor', 'Carbon Monoxide Sensor', 'Camera Rtp Stream Management', 'Doorbell',
-      'Fan', 'Fanv2', 'Garage Door Opener', 'Humidity Sensor', 'Input Source',
+    const supportedTypes = new Set([
+      'Battery', 'Carbon Dioxide Sensor', 'Carbon Monoxide Sensor', 'Camera Rtp Stream Management',
+      'Doorbell', 'Fan', 'Fanv2', 'Garage Door Opener', 'Humidity Sensor', 'Input Source',
       'Leak Sensor', 'Lightbulb', 'Lock Mechanism', 'Motion Sensor', 'Occupancy Sensor',
       'Outlet', 'Smoke Sensor', 'Speaker', 'Stateless Programmable Switch', 'Switch',
       'Television', 'Temperature Sensor', 'Thermostat', 'Contact Sensor',
-    ];
+    ]);
 
     return filterUnique(this.hbDevices)
-      .filter(service => supportedTypes.includes(service.humanType))
+      .filter(service => supportedTypes.has(service.humanType))
       .map(service => ({
         name: service.serviceName,
         fullName: `${service.serviceName} - ${service.type}`,
@@ -107,18 +108,22 @@ class HBConfigNode {
       .sort((a, b) => a.sortName.localeCompare(b.sortName));
   }
 
+
   handleDuplicates(list) {
-    const seenFullNames = new Set();
-    const seenUniqueIds = new Set();
+    const seen = new Map();
 
     list.forEach(endpoint => {
-      if (!seenFullNames.add(endpoint.fullName)) {
-        console.warn('WARNING: Duplicate device name', endpoint.fullName);
-      }
+      const { fullName, uniqueId } = endpoint;
 
-      if (!seenUniqueIds.add(endpoint.uniqueId)) {
-        console.error('ERROR: Duplicate uniqueId detected.', endpoint.fullName);
+      if (seen.has(fullName)) {
+        this.log.warn(`Duplicate device name detected: ${fullName}`);
       }
+      if (seen.has(uniqueId)) {
+        this.log.error(`Duplicate uniqueId detected: ${uniqueId}`);
+      }
+
+      seen.set(fullName, true);
+      seen.set(uniqueId, true);
     });
   }
 
@@ -130,7 +135,6 @@ class HBConfigNode {
 
   async connectClientNodes() {
     debug('connect %s nodes', Object.keys(this.clientNodes).length);
-    console.log(this.clientNodes);
     for (const [key, clientNode] of Object.entries(this.clientNodes)) {
       // debug('_Register: %s type: %s', clientNode.type, clientNode.name, clientNode.instance);
       const matchedDevice = this.hbDevices.find(service =>
@@ -151,9 +155,22 @@ class HBConfigNode {
   }
 
   async monitorDevices() {
-    debug('monitorDevices', Object.keys(this.clientNodes).length);
     if (Object.keys(this.clientNodes).length) {
-      const monitorNodes = this.clientNodes.filter(clientNode => clientNode.config.type === 'hb-status' || clientNode.config.type === 'hb-event').hbDevice;
+      const uniqueDevices = new Set();
+
+      const monitorNodes = Object.values(this.clientNodes)
+        .filter(node => ['hb-status', 'hb-control'].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
+        })
+        .map(node => node.hbDevice) // Map to hbDevice property
+        .filter(Boolean); // Remove any undefined or null values, if present;
+      debug('monitorNodes', Object.keys(monitorNodes).length);
+      // console.log('monitorNodes', monitorNodes);
       this.monitor = await this.hapClient.monitorCharacteristics(monitorNodes);
       this.monitor.on('service-update', (services) => {
         services.forEach(service => {
@@ -166,7 +183,12 @@ class HBConfigNode {
       this.monitor.on('monitor-close', (instance, hadError) => {
         debug('monitor-close', instance.name, instance.ipAddress, instance.port, hadError)
         this.disconnectClientNodes(instance);
-        this.refreshDevices();
+        // this.refreshDevices();
+      })
+      this.monitor.on('monitor-refresh', (instance, hadError) => {
+        debug('monitor-refresh', instance.name, instance.ipAddress, instance.port, hadError)
+        this.reconnectClientNodes(instance);
+        // this.refreshDevices();
       })
       this.monitor.on('monitor-error', (instance, hadError) => {
         debug('monitor-error', instance, hadError)
@@ -186,6 +208,18 @@ class HBConfigNode {
     });
   }
 
+  reconnectClientNodes(instance) {
+    debug('reconnectClientNodes', `${instance.ipAddress}:${instance.port}`);
+    const clientNodes = Object.values(this.clientNodes).filter(clientNode => {
+      return `${clientNode.hbDevice.instance.ipAddress}:${clientNode.hbDevice.instance.port}` === `${instance.ipAddress}:${instance.port}`;
+    });
+
+    clientNodes.forEach(clientNode => {
+      clientNode.status({ fill: 'green', shape: 'dot', text: 'connected' });
+      clientNode.emit('hbReady', clientNode.hbDevice);
+    });
+  }
+
   close() {
     debug('hb-config: close');
     this.hapClient?.destroy();

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

@@ -61,7 +61,7 @@
                 "vt": "str"
             }
         ],
-        "repeat": "60",
+        "repeat": "",
         "crontab": "",
         "once": true,
         "onceDelay": "60",
@@ -300,7 +300,7 @@
         "topic": "",
         "payload": "",
         "payloadType": "date",
-        "x": 320,
+        "x": 280,
         "y": 260,
         "wires": [
             [
@@ -672,7 +672,7 @@
                 "vt": "str"
             }
         ],
-        "repeat": "60",
+        "repeat": "",
         "crontab": "",
         "once": true,
         "onceDelay": "60",
@@ -757,7 +757,7 @@
         "statusVal": "payload",
         "statusType": "msg",
         "x": 1190,
-        "y": 300,
+        "y": 280,
         "wires": []
     }
 ]

package/test/node-red/flows.json

@@ -300,7 +300,7 @@
         "topic": "",
         "payload": "",
         "payloadType": "date",
-        "x": 320,
+        "x": 280,
         "y": 260,
         "wires": [
             [