node-red-contrib-homebridge-automation 0.1.12-beta.23 → 0.1.12-beta.25

package/package.json

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

package/src/HAP-NodeRed.js

@@ -11,10 +11,7 @@ const HbStatusNode = require('./hbStatusNode');
 const HapDeviceRoutes = require('./HapDeviceRoutes');
 
 module.exports = function (RED) {
-  var evDevices = [];
-  var ctDevices = [];
   var hbDevices;
-  var homebridge;
 
   /**
    * hbConf - Configuration

package/src/hbBaseNode.js

@@ -24,18 +24,32 @@ class HbBaseNode {
       this.on('input', this.handleInput.bind(this));
     }
     this.on('close', this.handleClose.bind(this));
-    this.hbConfigNode.on('event', this.handleHBEventMessage.bind(this));
-    this.on('topic', this.handleHBTopicMessage.bind(this));
+    this.on('hbEvent', this.handleHBEventMessage.bind(this));
   }
 
   handleHBEventMessage(service) {
-    debug('event for', this.id, service.serviceName, service.values);
-  }
+    debug('hbEvent for', this.id, service.serviceName, service.values);
 
-  handleHBTopicMessage(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 });
   }
 
+  createMessage(event, isInitialState = false) {
+    return {
+      name: this.node.name,
+      payload: this.state,
+      Homebridge: this.node.hbDevice.homebridge,
+      Manufacturer: this.node.hbDevice.manufacturer,
+      Service: this.node.hbDevice.deviceType,
+      _device: this.node.device,
+      _confId: this.node.confId,
+      _rawEvent: isInitialState ? event : undefined,
+    };
+  }
 
   registerNode() {
     debug("Registering node:", this.fullName);

package/src/hbConfigNode.js

@@ -1,13 +1,10 @@
-// const EventEmitter = require('events'); // Import EventEmitter
 const { HapClient } = require('@homebridge/hap-client');
 const debug = require('debug')('hapNodeRed:hbConfigNode');
 const { Log } = require('./lib/logger.js');
 const Queue = require('better-queue');
 
-class HBConfigNode { // Extend EventEmitter
+class HBConfigNode {
   constructor(config, RED) {
-    // super(); // Call EventEmitter's constructor
-
     if (!config.jest) {
       RED.nodes.createNode(this, config);
 
@@ -41,10 +38,7 @@ class HBConfigNode { // Extend EventEmitter
       this.waitForNoMoreDiscoveries();
       this.hapClient.on('instance-discovered', this.waitForNoMoreDiscoveries);
 
-      this.on('close', () => {
-        debug('close');
-        this.close();
-      });
+      this.on('close', this.close.bind(this));
     }
   }
 
@@ -70,19 +64,16 @@ class HBConfigNode { // Extend EventEmitter
   }
 
   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}`,
@@ -126,53 +117,34 @@ class HBConfigNode { // Extend EventEmitter
       debug('_Register %s -> %s', clientNode.type, clientNode.name);
       clientNode.hbDevice = this.hbDevices.find(service => {
         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' });
+        if (clientNode.device === deviceUnique) {
+          clientNode.status({ fill: 'green', shape: 'dot', text: 'connected' });
+          clientNode.emit('hbReady', service);
+        }
         return clientNode.device === deviceUnique;
       });
 
-      debug(clientNode.type);
       if (clientNode.config.type === 'hb-status') {
-        debug('Adding', clientNode.name, clientNode.device)
         this.monitorNodes[clientNode.device] = clientNode.hbDevice;
       }
-      console.log(this.monitorNodes);
+
       if (!clientNode.hbDevice) {
         console.error('ERROR: _register - HB Device Missing', clientNode.name);
       }
     }
-    debug(`Registering ${Object.keys(this.monitorNodes).length} nodes for events`);
-    // console.log(Object.keys(this.monitorNodes));
+
     if (Object.keys(this.monitorNodes).length) {
-      debug(`Registering ${Object.keys(this.monitorNodes).length} nodes for events`);
       this.monitor = await this.hapClient.monitorCharacteristics(Object.values(this.monitorNodes));
       this.monitor.on('service-update', (services) => {
-        // Emit events for updated services
         for (const service of services) {
-          debug(`${service.instance.name}${service.instance.username}${service.accessoryInformation.Manufacturer}${service.serviceName}${service.uuid.slice(0, 8)}`,
-            service.values)
-          this.emit(
-            `${service.instance.name}${service.instance.username}${service.accessoryInformation.Manufacturer}${service.serviceName}${service.uuid.slice(0, 8)}`,
-            service.values
-          );
-          debug('event',
-            service.serviceName, service.values)
-          this.emit(
-            'event',
-            service
-          );
-          // console.log(this.clientNodes);
-
           const eventNodes = Object.values(this.clientNodes).filter(
-
-            (clientNode) =>
+            clientNode =>
               clientNode.config.device === `${service.instance.name}${service.instance.username}${service.accessoryInformation.Manufacturer}${service.serviceName}${service.uuid.slice(0, 8)}`
-
           );
-          console.log('eventNodes, ', eventNodes);
+
           eventNodes.forEach((eventNode) => {
-            debug('emit', eventNode.name, eventNode.type)
             if (eventNode._events && typeof eventNode.emit === 'function') {
-              eventNode.emit('topic', service);
+              eventNode.emit('hbEvent', service);
             }
           });
         }
@@ -182,11 +154,7 @@ class HBConfigNode { // Extend EventEmitter
   }
 
   deregister(clientNode) {
-    clientNode.status({
-      text: 'disconnected',
-      shape: 'ring',
-      fill: 'red',
-    });
+    clientNode.status({ text: 'disconnected', shape: 'ring', fill: 'red' });
     delete this.clientNodes[clientNode.id];
   }
 

package/src/hbEventNode.js

@@ -3,87 +3,21 @@ const debug = require('debug')('hapNodeRed:hbEventNode');
 
 class HbEventNode extends hbBaseNode {
   constructor(config, RED) {
-    // console.log('HbEventNode', config);
     super(config, RED);
     this.sendInitialState = config.sendInitialState === true;
-    this.hbConfigNode.register(this.config, this.registerNode.bind(this));
+    this.on('hbReady', this.handleHbReady.bind(this))
   }
 
-  // Handle event command processing
-  command(event) {
-    if (event.status === true && event.value !== undefined) {
-      this.state = { ...this.state, ...this._convertHBcharacteristicToNode([event]) };
-      const msg = this.createMessage(event);
-      this.updateStatus({ text: `${JSON.stringify(msg.payload).slice(0, 30)}...`, shape: 'dot', fill: 'green' });
-      this.send(msg);
-    } else if (event.status === true) {
-      this.updateStatus({ text: 'connected', shape: 'dot', fill: 'green' });
-    } else {
-      this.updateStatus({ text: `disconnected: ${event.status}`, shape: 'ring', fill: 'red' });
-    }
-  }
-
-  // Handle device registration logic
-  handleDeviceRegistration() {
-    debug('hbEvent.register', this);
-    this.node.hbDevice = this.findDevice(this.node.device, { perms: 'pr' });
-
-    if (this.node.hbDevice) {
-      this.registerEventHandlers();
-      this.fetchInitialState();
-    } else {
-      this.node.error(`Can't find device ${this.node.device}`);
-    }
-  }
-
-  // Register for device events
-  registerEventHandlers() {
-    this.node.deviceType = this.node.hbDevice.deviceType;
-    this.node.listener = this.command;
-    this.node.eventName = [];
-
-    this.node.hbDevice.eventRegisters.forEach((event) => {
-      this.registerEvent(this.node.hbDevice.id + event.aid + event.iid);
-    });
-
-    this.updateStatus({ text: 'connected', shape: 'dot', fill: 'green' });
-  }
-
-  // Fetch and send initial state if required
-  fetchInitialState() {
-    this.fetchStatus(this.node.device, { perms: 'ev' }, (err, message) => {
-      if (!err) {
-        this.state = this._convertHBcharacteristicToNode(message.characteristics);
-        debug(
-          'hbEvent received: %s = %s',
-          this.node.fullName,
-          `${JSON.stringify(message.characteristics).slice(0, 80)}...`
-        );
-
-        if (this.sendInitialState) {
-          const msg = this.createMessage(message, true);
-          this.updateStatus({ text: `${JSON.stringify(msg.payload).slice(0, 30)}...`, shape: 'dot', fill: 'green' });
-          this.send(msg);
-        }
-      } else {
-        this.node.error('hbEvent _status: error', this.node.fullName, err);
-      }
+  handleHbReady(service) {
+    this.status({
+      text: JSON.stringify(service.values),
+      shape: 'dot',
+      fill: 'green',
     });
+    this.send({ payload: service.values });
   }
-
   // Create a message payload for event or initial state
-  createMessage(event, isInitialState = false) {
-    return {
-      name: this.node.name,
-      payload: this.state,
-      Homebridge: this.node.hbDevice.homebridge,
-      Manufacturer: this.node.hbDevice.manufacturer,
-      Service: this.node.hbDevice.deviceType,
-      _device: this.node.device,
-      _confId: this.node.confId,
-      _rawEvent: isInitialState ? event : undefined,
-    };
-  }
+
 }
 
 module.exports = HbEventNode;

package/src/hbResumeNode.js

@@ -19,10 +19,21 @@ class HbResumeNode extends HbBaseNode {
     // Handle device registration
     debug('hbResume - hbConfigNode', this.hbConfigNode);
     // debug('hbResume - hbConfigNode', this.configNode.hbConfigNode);
-    this.hbConfigNode.register(this.config, this.registerNode.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 });
   }
 
-  handleInput(msg) {
+  handleInput(msg, send) {
     this.msg = msg;
     debug("hbResume.input: %s input", this.fullName, JSON.stringify(msg));
 
@@ -51,7 +62,7 @@ class HbResumeNode extends HbBaseNode {
             newMsg = msg;
           }
 
-          this.send(newMsg.payload.On ? newMsg : { ...newMsg, payload: { On: false } });
+          send(newMsg.payload.On ? newMsg : { ...newMsg, payload: { On: false } });
           debug("hbResume.input: %s output", this.fullName, JSON.stringify(newMsg));
           this.updateStatus(newMsg.payload);
           this.lastMessageValue = newMsg.payload;

package/src/hbStatusNode.js

@@ -6,7 +6,7 @@ class HbStatusNode extends HbBaseNode {
     super(config, RED);
   }
 
-  async handleInput(message) {
+  async handleInput(message, send) {
     debug('handleInput', message.payload, this.name);
 
     if (!this.hbDevice) {
@@ -23,7 +23,7 @@ class HbStatusNode extends HbBaseNode {
     });
 
     message.payload = result.values;
-    this.send(message);
+    send(message);
   }
 }
 

package/test/node-red/flows.json

@@ -95,48 +95,10 @@
             ]
         ]
     },
-    {
-        "id": "696e04753d952daf",
-        "type": "hb-status",
-        "z": "caef1e7b5b399e80",
-        "d": true,
-        "name": "West Bedroom",
-        "Homebridge": "homebridge",
-        "Manufacturer": "Tasmota",
-        "Service": "Lightbulb",
-        "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
-        "conf": "557aec8e8c47e61e",
-        "x": 480,
-        "y": 300,
-        "wires": [
-            [
-                "a866ae0bb24ce682"
-            ]
-        ]
-    },
-    {
-        "id": "bb88544904b343a1",
-        "type": "hb-event",
-        "z": "caef1e7b5b399e80",
-        "d": true,
-        "name": "",
-        "Homebridge": "homebridge",
-        "Manufacturer": "Tasmota",
-        "Service": "Lightbulb",
-        "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
-        "conf": "557aec8e8c47e61e",
-        "sendInitialState": false,
-        "x": 250,
-        "y": 380,
-        "wires": [
-            []
-        ]
-    },
     {
         "id": "452e3e6171aa7a25",
         "type": "hb-resume",
         "z": "caef1e7b5b399e80",
-        "d": true,
         "name": "West Bedroom",
         "Homebridge": "homebridge",
         "Manufacturer": "Tasmota",
@@ -179,7 +141,7 @@
         "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom Fan00000040",
         "conf": "557aec8e8c47e61e",
         "outputs": 0,
-        "x": 510,
+        "x": 810,
         "y": 600,
         "wires": []
     },
@@ -223,8 +185,8 @@
         "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
         "conf": "557aec8e8c47e61e",
         "outputs": 0,
-        "x": 740,
-        "y": 660,
+        "x": 800,
+        "y": 680,
         "wires": []
     },
     {
@@ -401,5 +363,82 @@
                 "6703815a8874b156"
             ]
         ]
+    },
+    {
+        "id": "80ffdbb93cd24b48",
+        "type": "inject",
+        "z": "caef1e7b5b399e80",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"On\": true}",
+        "payloadType": "json",
+        "x": 150,
+        "y": 340,
+        "wires": [
+            [
+                "452e3e6171aa7a25"
+            ]
+        ]
+    },
+    {
+        "id": "d0e413b3c28f757a",
+        "type": "inject",
+        "z": "caef1e7b5b399e80",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"On\": false}",
+        "payloadType": "json",
+        "x": 150,
+        "y": 400,
+        "wires": [
+            [
+                "452e3e6171aa7a25"
+            ]
+        ]
+    },
+    {
+        "id": "82638dac6ac32bb1",
+        "type": "hb-event",
+        "z": "caef1e7b5b399e80",
+        "name": "West Bedroom",
+        "Homebridge": "homebridge",
+        "Manufacturer": "Tasmota",
+        "Service": "Lightbulb",
+        "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
+        "conf": "557aec8e8c47e61e",
+        "sendInitialState": true,
+        "x": 500,
+        "y": 260,
+        "wires": [
+            [
+                "a866ae0bb24ce682"
+            ]
+        ]
     }
 ]

package/src/hbDevices.js

@@ -1,10 +0,0 @@
-const { Homebridges } = require('./lib/Homebridges.js');
-const HAPNodeJSClient = require('hap-node-client').HAPNodeJSClient;
-
-class hbDevices {
-
-
-
-}
-
-modules.export = hbDevices;

package/src/lib/Accessory.js

@@ -1,126 +0,0 @@
-var debug = require('debug')('Accessory');
-var Service = require('./Service.js').Service;
-
-module.exports = {
-  Accessory: Accessory
-};
-
-/*
- * Homebridges -> Homebridge -> Accessory -> Service -> Characteristic
- */
-
-function Accessory(devices, context) {
-  // debug("Accessory", devices);
-  this.aid = devices.aid;
-  this.host = context.host;
-  this.port = context.port;
-  this.homebridge = context.homebridge;
-  this.id = context.id;
-  this.services = [];
-  devices.services.forEach(function (element) {
-    // debug("Service", element);
-    switch (element.type.substring(0, 8)) {
-      case "0000003E": // Accessory Information
-        this.info = information(element.characteristics);
-        break;
-      case "00000110": // Camera RTPStream Management generates duplicates
-        var service = new Service(element, this);
-        // console.log('services', this.services);
-        if (this.services.some(e => e.type === '00000110')) {
-
-        } else {
-          this.services.push(service);
-        }
-        break;
-      case "000000D9": // Input Source from webosTV has a dummy input source
-        var service = new Service(element, this);
-        if (service.name !== "dummy") {
-          this.services.push(service);
-        }
-        break;
-      default:
-        var service = new Service(element, this);
-        this.services.push(service);
-    }
-  }.bind(this));
-  // debug("Info", this.info);
-}
-
-Accessory.prototype.toList = function (context) {
-  var list = [];
-  // debug("toList", context);
-  context.aid = this.aid;
-  if (!this.info) {
-    console.log("ERROR: incorrect version of plugin, please upgrade");
-  }
-  context.name = this.info.Name;
-  context.manufacturer = this.info.Manufacturer;
-  for (var index in this.services) {
-    var service = this.services[index].toList(context);
-    if (service) {
-      list = list.concat(service);
-    }
-  }
-
-  // debug('toList', new Error('test'));
-  // debug("opt",context.opt,list.length);
-  return (list);
-};
-
-/*
-[ { iid: 2,
-    type: '00000014-0000-1000-8000-0026BB765291',
-    perms: [Array],
-    format: 'bool',
-    description: 'Identify' },
-  { iid: 3,
-    type: '00000020-0000-1000-8000-0026BB765291',
-    perms: [Array],
-    format: 'string',
-    value: 'NorthernMan54',
-    description: 'Manufacturer' },
-  { iid: 4,
-    type: '00000021-0000-1000-8000-0026BB765291',
-    perms: [Array],
-    format: 'string',
-    value: 'dht22',
-    description: 'Model' },
-  { iid: 5,
-    type: '00000023-0000-1000-8000-0026BB765291',
-    perms: [Array],
-    format: 'string',
-    value: 'Basement',
-    description: 'Name' },
-  { iid: 6,
-    type: '00000030-0000-1000-8000-0026BB765291',
-    perms: [Array],
-    format: 'string',
-    value: 'penny-Basement',
-    description: 'Serial Number' },
-  { iid: 7,
-    type: '00000052-0000-1000-8000-0026BB765291',
-    perms: [Array],
-    format: 'string',
-    value: '0.1.21',
-    description: 'Firmware Revision' } ],
-    */
-
-/*
-{ Identify: undefined,
-  Manufacturer: 'Default-Manufacturer',
-  Model: 'Default-Model',
-  Name: 'FHall',
-  SerialNumber: 'Default-SerialNumber',
-  FirmwareRevision: '1.0' }
-  */
-
-function information(characteristics) {
-  var result = {};
-  characteristics.forEach(function (characteristic) {
-    if (characteristic.description) {
-      var key = characteristic.description.replace(/ /g, '').replace(/\./g, '_');
-      result[key] = characteristic.value;
-    }
-  });
-  return result;
-}

package/src/lib/Characteristic.js

@@ -1,30 +0,0 @@
-var debug = require('debug')('Characteristic');
-// var Service = require('./Service.js').Service;
-
-module.exports = {
-  Characteristic: Characteristic
-};
-
-/*
-* Homebridges -> Homebridge -> Accessory -> Service -> Characteristic
-*/
-
-function Characteristic(devices, context) {
-  // debug("Characteristic", devices);
-  this.iid = devices.iid;
-  this.type = devices.type.substring(0, 8);
-  this.perms = devices.perms;
-  this.value = devices.value;
-  this.description = (devices.description ? devices.description : this.type);
-  this.characteristic = {};
-  this.getCharacteristic = context.aid + '.' + this.iid;
-  this.characteristic[this.getCharacteristic] = {
-    characteristic: this.description.replace(/ /g, "").replace(/\./g, "_"),
-    iid: this.iid
-  };
-  this.eventRegister = {
-    aid: context.aid,
-    iid: this.iid,
-    "ev": true
-  };
-}