node-red-contrib-homebridge-automation 0.1.12-beta.22 → 0.1.12-beta.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-homebridge-automation",
-  "version": "0.1.12-beta.22",
+  "version": "0.1.12-beta.24",
   "description": "NodeRED Automation for HomeBridge",
   "main": "src/HAP-NodeRed.js",
   "scripts": {
@@ -48,7 +48,7 @@
   "dependencies": {
     "better-queue": ">=3.8.12",
     "debug": "^4.3.5",
-    "@homebridge/hap-client": "2.0.4"
+    "@homebridge/hap-client": "2.0.5-beta.2"
   },
   "author": "NorthernMan54",
   "license": "ISC",

package/src/hbBaseNode.js

@@ -24,8 +24,21 @@ class HbBaseNode {
       this.on('input', this.handleInput.bind(this));
     }
     this.on('close', this.handleClose.bind(this));
+    this.on('event', this.handleHBEventMessage.bind(this));
   }
 
+  handleHBEventMessage(service) {
+    debug('topic for', this.id, service.serviceName, service.values);
+
+    this.status({
+      text: JSON.stringify(service.values),
+      shape: 'dot',
+      fill: 'green',
+    });
+    this.send({ payload: service.values });
+  }
+
+
   registerNode() {
     debug("Registering node:", this.fullName);
     this.hbDevice = hbDevices.findDevice(this.device);
@@ -38,6 +51,7 @@ class HbBaseNode {
   }
 
   handleClose(callback) {
+    debug('close', this.name);
     callback();
   }
 
@@ -101,29 +115,6 @@ class HbBaseNode {
     }
   }
 
-  async _control(node, payload) {
-    try {
-      const device = hbDevices.findDevice(node.device, { perms: 'pw' });
-      if (!device) throw new Error('Device not available');
-
-      const message = typeof payload === "object"
-        ? this._createControlMessage(payload, node, device)
-        : null;
-
-      if (message && message.characteristics.length > 0) {
-        const status = await this.HAPcontrolByDeviceIDAsync(device.id, JSON.stringify(message));
-        node.status({ text: 'Controlled', shape: 'dot', fill: 'green' });
-        return status;
-      } else {
-        throw new Error('Invalid payload');
-      }
-    } catch (err) {
-      debug("Error in _control:", err);
-      node.status({ text: 'Control error', shape: 'ring', fill: 'red' });
-      throw err;
-    }
-  }
-
   async _register(node) {
     try {
       const device = hbDevices.findDevice(node.device, { perms: 'ev' });

package/src/hbConfigNode.js

@@ -1,7 +1,5 @@
-const hbBaseNode = require('./hbBaseNode.js');
 const { HapClient } = require('@homebridge/hap-client');
 const debug = require('debug')('hapNodeRed:hbConfigNode');
-const { Homebridges } = require('./lib/Homebridges.js');
 const { Log } = require('./lib/logger.js');
 const Queue = require('better-queue');
 
@@ -18,6 +16,7 @@ class HBConfigNode {
       this.ctDevices = [];
       this.hbDevices = [];
       this.clientNodes = [];
+      this.monitorNodes = [];
       this.log = new Log(console, true);
 
       this.reqisterQueue = new Queue(this._register.bind(this), {
@@ -39,9 +38,7 @@ class HBConfigNode {
       this.waitForNoMoreDiscoveries();
       this.hapClient.on('instance-discovered', this.waitForNoMoreDiscoveries);
 
-      this.on('close', () => {
-        this.close();
-      });
+      this.on('close', this.close.bind(this));
     }
   }
 
@@ -67,19 +64,16 @@ class HBConfigNode {
   }
 
   toList(perms) {
-    const supportedServiceType = (service) => {
-      const supportedTypes = [
-        'Battery', 'Carbon Dioxide Sensor', 'Carbon Monoxide Sensor', '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 supportedTypes.includes(service.humanType);
-    };
+    const supportedTypes = [
+      'Battery', 'Carbon Dioxide Sensor', 'Carbon Monoxide Sensor', '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 this.hbDevices
-      .filter(service => supportedServiceType(service))
+      .filter(service => supportedTypes.includes(service.humanType))
       .map(service => ({
         name: service.serviceName,
         fullName: `${service.serviceName} - ${service.type}`,
@@ -122,30 +116,48 @@ class HBConfigNode {
     for (const clientNode of clientNodes) {
       debug('_Register %s -> %s', clientNode.type, clientNode.name);
       clientNode.hbDevice = this.hbDevices.find(service => {
-        const testValue = `${service.instance.name}${service.instance.username}${service.accessoryInformation.Manufacturer}${service.serviceName}${service.uuid.slice(0, 8)}`;
+        const deviceUnique = `${service.instance.name}${service.instance.username}${service.accessoryInformation.Manufacturer}${service.serviceName}${service.uuid.slice(0, 8)}`;
         clientNode.status({ fill: 'green', shape: 'dot', text: 'connected' });
-        return clientNode.device === testValue;
+        return clientNode.device === deviceUnique;
       });
 
+      if (clientNode.config.type === 'hb-status') {
+        this.monitorNodes[clientNode.device] = clientNode.hbDevice;
+      }
+
       if (!clientNode.hbDevice) {
         console.error('ERROR: _register - HB Device Missing', clientNode.name);
       }
     }
+
+    if (Object.keys(this.monitorNodes).length) {
+      this.monitor = await this.hapClient.monitorCharacteristics(Object.values(this.monitorNodes));
+      this.monitor.on('service-update', (services) => {
+        for (const service of services) {
+          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)}`
+          );
+
+          eventNodes.forEach((eventNode) => {
+            if (eventNode._events && typeof eventNode.emit === 'function') {
+              eventNode.emit('event', service);
+            }
+          });
+        }
+      });
+    }
     cb(null);
   }
 
   deregister(clientNode) {
-    clientNode.status({
-      text: 'disconnected',
-      shape: 'ring',
-      fill: 'red',
-    });
+    clientNode.status({ text: 'disconnected', shape: 'ring', fill: 'red' });
     delete this.clientNodes[clientNode.id];
   }
 
   close() {
     if (this.hapClient) {
-      this.hapClient.close();
+      this.hapClient.destroy();
     }
   }
 }

package/src/hbControlNode.js

@@ -8,7 +8,6 @@ class HbControlNode extends hbBaseNode {
 
   async handleInput(message) {
     debug('handleInput', message.payload, this.name);
-
     if (!this.hbDevice) {
       this.error('HB not initialized');
       this.status({ text: 'HB not initialized', shape: 'ring', fill: 'red' });
@@ -28,19 +27,13 @@ class HbControlNode extends hbBaseNode {
     let fill = 'green';
 
     for (const key of Object.keys(message.payload)) {
-      const characteristic = this.hbDevice.serviceCharacteristics.find(c => c.type === key);
-
-      if (characteristic) {
-        try {
-          const result = await characteristic.setValue(message.payload[key]);
-          results.push({ [result.type]: result.value });
-        } catch (error) {
-          this.error(`Failed to set value for ${key}: ${error.message}`);
-          fill = 'red';
-        }
-      } else {
-        this.error(`Invalid characteristic '${key}' found in the message: ${JSON.stringify(message.payload)}`);
-        results.push({ 'Invalid Key': key });
+
+      try {
+        const result = await this.hbDevice.setCharacteristicByType(key, message.payload[key]);
+        results.push({ [result.type]: result.value });
+      } catch (error) {
+        this.error(`Failed to set value for ${key}: ${error.message}`);
+        results.push({ key: key + ' ' + error.message })
         fill = 'red';
       }
     }
@@ -51,10 +44,6 @@ class HbControlNode extends hbBaseNode {
       fill,
     });
   }
-
-  handleClose(callback) {
-    callback();
-  }
 }
 
 module.exports = HbControlNode;

package/src/hbStatusNode.js

@@ -1,51 +1,29 @@
-const HbBaseNode = require('./hbBaseNode'); // Path to HbBaseNode file
+const HbBaseNode = require('./hbBaseNode');
 const debug = require('debug')('hapNodeRed:hbStatusNode');
 
 class HbStatusNode extends HbBaseNode {
   constructor(config, RED) {
-    // console.log('hbStatusNode - contructor', config);
     super(config, RED);
   }
 
-  /**
-   * Handle input events specific to HbStatusNode
-   * @param {Object} msg - Input message
-   */
-  handleInput(msg, send, done) {
-    this.msg = msg;
-    debug('handleInput', this);
-    this.node._status(this.device, this, { perms: 'pr' }, (err, message) => {
-      if (!err) {
-        debug(
-          "hbStatus received: %s = %s",
-          JSON.stringify(this.fullName),
-          JSON.stringify(message).slice(0, 80) + '...',
-          JSON.stringify(this.hbDevice)
-        );
+  async handleInput(message, send) {
+    debug('handleInput', message.payload, this.name);
 
-        this.msg.name = this.name;
-        this.msg._rawMessage = message;
-        this.msg.payload = this._convertHBcharactericToNode(message.characteristics, this);
+    if (!this.hbDevice) {
+      this.error('HB not initialized');
+      this.status({ text: 'HB not initialized', shape: 'ring', fill: 'red' });
+      return;
+    }
 
-        if (this.hbDevice) {
-          this.msg.Homebridge = this.hbDevice.homebridge;
-          this.msg.Manufacturer = this.hbDevice.manufacturer;
-          this.msg.Service = this.hbDevice.service;
-          this.msg._device = this.device;
-          this.msg._confId = this.confId;
-        }
-
-        this.status({
-          text: JSON.stringify(this.msg.payload).slice(0, 30) + '...',
-          shape: 'dot',
-          fill: 'green',
-        });
-
-        this.send(this.msg);
-      } else {
-        this.error(err, this.msg);
-      }
+    const result = await this.hbDevice.refreshCharacteristics();
+    this.status({
+      text: JSON.stringify(await this.hbDevice.values),
+      shape: 'dot',
+      fill: 'green'
     });
+
+    message.payload = result.values;
+    send(message);
   }
 }
 

package/test/node-red/flows.json

@@ -81,7 +81,6 @@
         "id": "3d7babac3a298e60",
         "type": "hb-status",
         "z": "caef1e7b5b399e80",
-        "d": true,
         "name": "West Bedroom",
         "Homebridge": "homebridge",
         "Manufacturer": "Tasmota",
@@ -108,7 +107,7 @@
         "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
         "conf": "557aec8e8c47e61e",
         "x": 480,
-        "y": 260,
+        "y": 300,
         "wires": [
             [
                 "a866ae0bb24ce682"