node-red-contrib-homebridge-automation 0.0.86-beta.2 → 0.0.86

package/HAP-NodeRed.js

@@ -4,12 +4,12 @@ var Queue = require('better-queue');
 var Homebridges = require('./lib/Homebridges.js').Homebridges;
 var HAPNodeJSClient = require('hap-node-client').HAPNodeJSClient;
 
-module.exports = function(RED) {
+module.exports = function (RED) {
   var evDevices = [];
   var ctDevices = [];
   var hbDevices;
   var homebridge;
-  var reqisterQueue = new Queue(function(node, cb) {
+  var reqisterQueue = new Queue(function (node, cb) {
     _register.call(node.that, node, cb);
   }, {
     concurrent: 1,
@@ -43,12 +43,12 @@ module.exports = function(RED) {
       homebridge = new HAPNodeJSClient({
         "pin": n.username,
         "refresh": 900,
-        "debug": true,
+        "debug": false,
         "timeout": 20,
         "reqTimeout": 7000
       });
       reqisterQueue.pause();
-      homebridge.on('Ready', function(accessories) {
+      homebridge.on('Ready', function (accessories) {
         // evDevices = register.registerEv(homebridge, accessories);
         // ctDevices = register.registerCt(homebridge, accessories);
         hbDevices = new Homebridges(accessories);
@@ -105,11 +105,11 @@ module.exports = function(RED) {
 
     var node = this;
 
-    this.connect = function(callback) {
+    this.connect = function (callback) {
       callback();
     };
 
-    this.register = function(deviceNode, callback) {
+    this.register = function (deviceNode, callback) {
       debug("hbConf.register", deviceNode.fullName);
       node.users[deviceNode.id] = deviceNode;
       debug("Register %s -> %s", deviceNode.type, deviceNode.fullName);
@@ -124,7 +124,7 @@ module.exports = function(RED) {
       // debug("Register Queue - push", reqisterQueue.getStats());
     };
 
-    this.deregister = function(deviceNode, callback) {
+    this.deregister = function (deviceNode, callback) {
       deviceNode.status({
         text: 'disconnected',
         shape: 'ring',
@@ -134,14 +134,14 @@ module.exports = function(RED) {
       //
       // debug("hbEvent deregistered:", deviceNode.name);
       // if (homebridge.listenerCount(deviceNode.eventName)) {
-      deviceNode.eventName.forEach(function(event) {
+      deviceNode.eventName.forEach(function (event) {
         homebridge.removeListener(event, deviceNode.listener);
       });
       // }
       callback();
     };
 
-    this.on('close', function() {
+    this.on('close', function () {
       if (node.client && node.client.connected) {
         node.client.end();
       }
@@ -177,7 +177,7 @@ module.exports = function(RED) {
 
     var node = this;
 
-    node.command = function(event) {
+    node.command = function (event) {
       // False messages can be received from accessories with multiple services
       // if (Object.keys(_convertHBcharactericToNode(event, node)).length > 0) {
       debug("hbEvent", node.name, event);
@@ -199,7 +199,7 @@ module.exports = function(RED) {
           fill: 'green'
         });
         clearTimeout(node.timeout);
-        node.timeout = setTimeout(function() {
+        node.timeout = setTimeout(function () {
           node.status({});
         }, 10 * 1000);
         node.send(msg);
@@ -219,7 +219,7 @@ module.exports = function(RED) {
     };
     // };
 
-    node.conf.register(node, function() {
+    node.conf.register(node, function () {
       debug("hbEvent.register", node.fullName);
       this.hbDevice = hbDevices.findDevice(node.device, {
         perms: 'pr'
@@ -230,7 +230,7 @@ module.exports = function(RED) {
 
         _status(node.device, node, {
           perms: 'ev'
-        }, function(err, message) {
+        }, function (err, message) {
           if (!err) {
             node.state = _convertHBcharactericToNode(message.characteristics, node);
             debug("hbEvent received: %s = %s", node.fullName, JSON.stringify(message.characteristics), node.state);
@@ -251,7 +251,7 @@ module.exports = function(RED) {
                 fill: 'green'
               });
               clearTimeout(node.timeout);
-              node.timeout = setTimeout(function() {
+              node.timeout = setTimeout(function () {
                 node.status({});
               }, 10 * 1000);
               node.send(msg);
@@ -265,7 +265,7 @@ module.exports = function(RED) {
         node.eventName = [];
         // node.eventName = this.hbDevice.host + this.hbDevice.port + this.hbDevice.aid;
         // debug("DEVICE", this.hbDevice);
-        this.hbDevice.eventRegisters.forEach(function(event) {
+        this.hbDevice.eventRegisters.forEach(function (event) {
           homebridge.on(node.hbDevice.id + event.aid + event.iid, node.command);
           node.eventName.push(node.hbDevice.id + event.aid + event.iid);
         });
@@ -280,7 +280,7 @@ module.exports = function(RED) {
       }
     }.bind(this));
 
-    node.on('close', function(callback) {
+    node.on('close', function (callback) {
       node.conf.deregister(node, callback);
     });
   }
@@ -325,7 +325,8 @@ module.exports = function(RED) {
       On: false
     };
 
-    node.on('input', function(msg) {
+    node.on('input', function (msg) {
+      this.msg = msg;
       debug("hbResume.input: %s input", node.fullName, JSON.stringify(msg));
       if (typeof msg.payload === "object") {
         // Using this to validate input message contains valid Accessory Characteristics
@@ -370,7 +371,7 @@ module.exports = function(RED) {
               fill: 'green'
             });
             clearTimeout(node.timeout);
-            node.timeout = setTimeout(function() {
+            node.timeout = setTimeout(function () {
               node.status({});
             }, 10 * 1000);
             node.lastMessageValue = newMsg.payload;
@@ -379,7 +380,7 @@ module.exports = function(RED) {
             node.lastPayload = JSON.parse(JSON.stringify(msg.payload)); // store value not reference
           }
         } else {
-          node.error("Homebridge not initialized");
+          node.error("Homebridge not initialized", this.msg);
           node.status({
             text: 'Homebridge not initialized',
             shape: 'ring',
@@ -387,7 +388,7 @@ module.exports = function(RED) {
           });
         }
       } else {
-        node.error("Payload should be an JSON object containing device characteristics and values, ie {\"On\":false, \"Brightness\":0 }\nValid values include: " + node.hbDevice.descriptions);
+        node.error("Payload should be an JSON object containing device characteristics and values, ie {\"On\":false, \"Brightness\":0 }\nValid values include: " + node.hbDevice.descriptions, this.msg);
         node.status({
           text: 'Invalid payload',
           shape: 'ring',
@@ -396,7 +397,7 @@ module.exports = function(RED) {
       }
     });
 
-    node.command = function(event) {
+    node.command = function (event) {
       // debug("hbResume received event: %s ->", node.fullName, event);
       // debug("hbResume - internals %s millis, old %s, event %s, previous %s", Date.now() - node.lastMessageTime, node.lastMessageValue, event.status, node.state);
       // Don't update for events originating from here
@@ -436,7 +437,7 @@ module.exports = function(RED) {
       }
     };
 
-    node.conf.register(node, function() {
+    node.conf.register(node, function () {
       debug("hbResume.register:", node.fullName);
       this.hbDevice = hbDevices.findDevice(node.device, {
         perms: 'pw'
@@ -444,7 +445,7 @@ module.exports = function(RED) {
       if (this.hbDevice) {
         _status(node.device, node, {
           perms: 'pw'
-        }, function(err, message) {
+        }, function (err, message) {
           if (!err) {
             node.state = _convertHBcharactericToNode(message.characteristics, node);
             debug("hbResume received: %s = %s", node.fullName, JSON.stringify(message.characteristics), node.state);
@@ -459,7 +460,7 @@ module.exports = function(RED) {
         node.eventName = [];
         // node.eventName = this.hbDevice.host + this.hbDevice.port + this.hbDevice.aid;
         // homebridge.on(this.hbDevice.host + this.hbDevice.port + this.hbDevice.aid, node.command);
-        this.hbDevice.eventRegisters.forEach(function(event) {
+        this.hbDevice.eventRegisters.forEach(function (event) {
           homebridge.on(node.hbDevice.id + event.aid + event.iid, node.command);
           node.eventName.push(node.hbDevice.id + event.aid + event.iid);
         });
@@ -469,7 +470,7 @@ module.exports = function(RED) {
           fill: 'green'
         });
         clearTimeout(node.timeout);
-        node.timeout = setTimeout(function() {
+        node.timeout = setTimeout(function () {
           node.status({});
         }, 30 * 1000);
       } else {
@@ -477,7 +478,7 @@ module.exports = function(RED) {
       }
     }.bind(this));
 
-    node.on('close', function(callback) {
+    node.on('close', function (callback) {
       node.conf.deregister(node, callback);
     });
   }
@@ -502,26 +503,29 @@ module.exports = function(RED) {
 
     var node = this;
 
-    node.on('input', function(msg) {
+    node.on('input', function (msg) {
       const payload = {};
-      Object.keys(msg.payload).sort().forEach(function(key) {
+      this.msg = msg;
+      Object.keys(msg.payload).sort().forEach(function (key) {
         payload[key] = msg.payload[key];
       });
-      _control.call(this, node, msg.payload, function(err, data) {
+      _control.call(this, node, msg.payload, function (err, data) {
         if (!err && data) {
           // debug('hbControl', err, data); // Images produce alot of noise
           const msg = {};
           msg.payload = data;
           node.send(msg);
+        } else {
+          node.error(err, this.msg);
         }
-      });
+      }.bind(this));
     });
 
-    node.on('close', function(callback) {
+    node.on('close', function (callback) {
       callback();
     });
 
-    node.conf.register(node, function() {
+    node.conf.register(node, function () {
       // debug("hbControl.register:", node.fullName, node);
       switch (node.service) {
         case "Camera Control": // Camera Control
@@ -552,7 +556,7 @@ module.exports = function(RED) {
 
     var node = this;
 
-    node.conf.register(node, function() {
+    node.conf.register(node, function () {
       debug("hbStatus Registered:", node.fullName);
       this.hbDevice = hbDevices.findDevice(node.device);
       if (this.hbDevice) {
@@ -567,10 +571,11 @@ module.exports = function(RED) {
       }
     });
 
-    node.on('input', function(msg) {
+    node.on('input', function (msg) {
+      this.msg = msg;
       _status(this.device, node, {
         perms: 'pr'
-      }, function(err, message) {
+      }, function (err, message) {
         if (!err) {
           debug("hbStatus received: %s = %s", JSON.stringify(node.fullName), JSON.stringify(message));
           var msg = {
@@ -592,19 +597,19 @@ module.exports = function(RED) {
           });
           node.send(msg);
         } else {
-          node.error(err);
+          node.error(err, this.msg);
         }
-      });
+      }.bind(this));
     });
 
-    node.on('close', function(callback) {
+    node.on('close', function (callback) {
       callback();
     });
   }
 
   RED.nodes.registerType("hb-status", hbStatus);
 
-  RED.httpAdmin.post('/hap-device/refresh/:id', RED.auth.needsPermission('hb-event.read'), function(req, res) {
+  RED.httpAdmin.post('/hap-device/refresh/:id', RED.auth.needsPermission('hb-event.read'), function (req, res) {
     var id = req.params.id;
     var conf = RED.nodes.getNode(id);
     if (conf) {
@@ -616,7 +621,7 @@ module.exports = function(RED) {
     }
   });
 
-  RED.httpAdmin.get('/hap-device/evDevices/', RED.auth.needsPermission('hb-event.read'), function(req, res) {
+  RED.httpAdmin.get('/hap-device/evDevices/', RED.auth.needsPermission('hb-event.read'), function (req, res) {
     debug("evDevices", hbDevices.toList({
       perms: 'ev'
     }).length);
@@ -629,7 +634,7 @@ module.exports = function(RED) {
     }
   });
 
-  RED.httpAdmin.get('/hap-device/evDevices/:id', RED.auth.needsPermission('hb-event.read'), function(req, res) {
+  RED.httpAdmin.get('/hap-device/evDevices/:id', RED.auth.needsPermission('hb-event.read'), function (req, res) {
     debug("evDevices", hbDevices.toList({
       perms: 'ev'
     }).length);
@@ -642,7 +647,7 @@ module.exports = function(RED) {
     }
   });
 
-  RED.httpAdmin.post('/hap-device/refresh/:id', RED.auth.needsPermission('hb-resume.read'), function(req, res) {
+  RED.httpAdmin.post('/hap-device/refresh/:id', RED.auth.needsPermission('hb-resume.read'), function (req, res) {
     var id = req.params.id;
     var conf = RED.nodes.getNode(id);
     if (conf) {
@@ -654,7 +659,7 @@ module.exports = function(RED) {
     }
   });
 
-  RED.httpAdmin.get('/hap-device/evDevices/', RED.auth.needsPermission('hb-resume.read'), function(req, res) {
+  RED.httpAdmin.get('/hap-device/evDevices/', RED.auth.needsPermission('hb-resume.read'), function (req, res) {
     debug("evDevices", hbDevices.toList({
       perms: 'ev'
     }).length);
@@ -667,7 +672,7 @@ module.exports = function(RED) {
     }
   });
 
-  RED.httpAdmin.get('/hap-device/evDevices/:id', RED.auth.needsPermission('hb-resume.read'), function(req, res) {
+  RED.httpAdmin.get('/hap-device/evDevices/:id', RED.auth.needsPermission('hb-resume.read'), function (req, res) {
     debug("evDevices", hbDevices.toList({
       perms: 'ev'
     }).length);
@@ -680,7 +685,7 @@ module.exports = function(RED) {
     }
   });
 
-  RED.httpAdmin.get('/hap-device/ctDevices/', RED.auth.needsPermission('hb-control.read'), function(req, res) {
+  RED.httpAdmin.get('/hap-device/ctDevices/', RED.auth.needsPermission('hb-control.read'), function (req, res) {
     debug("ctDevices", hbDevices.toList({
       perms: 'pw'
     }).length);
@@ -693,7 +698,7 @@ module.exports = function(RED) {
     }
   });
 
-  RED.httpAdmin.get('/hap-device/ctDevices/:id', RED.auth.needsPermission('hb-control.read'), function(req, res) {
+  RED.httpAdmin.get('/hap-device/ctDevices/:id', RED.auth.needsPermission('hb-control.read'), function (req, res) {
     debug("ctDevices", hbDevices.toList({
       perms: 'pw'
     }).length);
@@ -721,7 +726,7 @@ module.exports = function(RED) {
     var payload = {};
     // characteristics = Object.assign(characteristics, characteristic.characteristic);
     if (device) {
-      hbMessage.forEach(function(characteristic) {
+      hbMessage.forEach(function (characteristic) {
         // debug("Exists", (device.characteristics[characteristic.aid + '.' + characteristic.iid]));
         if (device.characteristics[characteristic.aid + '.' + characteristic.iid]) {
           payload = Object.assign(payload, {
@@ -791,7 +796,7 @@ module.exports = function(RED) {
           default:
             var message = '?id=' + device.getCharacteristics;
             debug("_status request: %s -> %s:%s ->", node.fullName, device.id, message);
-            homebridge.HAPstatusByDeviceID(device.id, message, function(err, status) {
+            homebridge.HAPstatusByDeviceID(device.id, message, function (err, status) {
               if (!err) {
                 // debug("Status %s:%s ->", device.host, device.port, status);
                 node.status({
@@ -800,7 +805,7 @@ module.exports = function(RED) {
                   fill: 'green'
                 });
                 clearTimeout(node.timeout);
-                node.timeout = setTimeout(function() {
+                node.timeout = setTimeout(function () {
                   node.status({});
                 }, 30 * 1000);
                 callback(null, status);
@@ -846,7 +851,6 @@ module.exports = function(RED) {
    */
 
   function _control(node, payload, callback) {
-    // debug("_control", node.device);
     try {
       var device = hbDevices.findDevice(node.device, {
         perms: 'pw'
@@ -862,7 +866,7 @@ module.exports = function(RED) {
               "image-height": 1080
             };
             debug("Control %s ->", device.id, JSON.stringify(message));
-            homebridge.HAPresourceByDeviceID(device.id, JSON.stringify(message), function(err, status) {
+            homebridge.HAPresourceByDeviceID(device.id, JSON.stringify(message), function (err, status) {
               if (!err) {
                 debug("Controlled %s ->", device.id, JSON.stringify(payload));
                 node.status({
@@ -871,7 +875,7 @@ module.exports = function(RED) {
                   fill: 'green'
                 });
                 clearTimeout(node.timeout);
-                node.timeout = setTimeout(function() {
+                node.timeout = setTimeout(function () {
                   node.status({});
                 }, 30 * 1000);
                 callback(null, status);
@@ -892,7 +896,7 @@ module.exports = function(RED) {
               message = _createControlMessage.call(this, payload, node, device);
               debug("Control %s ->", device.id, JSON.stringify(message));
               if (message.characteristics.length > 0) {
-                homebridge.HAPcontrolByDeviceID(device.id, JSON.stringify(message), function(err, status) {
+                homebridge.HAPcontrolByDeviceID(device.id, JSON.stringify(message), function (err, status) {
                   if (!err && status && status.characteristics[0].status === 0) {
                     debug("Controlled %s ->", device.id, JSON.stringify(status));
                     node.status({
@@ -901,7 +905,7 @@ module.exports = function(RED) {
                       fill: 'green'
                     });
                     clearTimeout(node.timeout);
-                    node.timeout = setTimeout(function() {
+                    node.timeout = setTimeout(function () {
                       node.status({});
                     }, 10 * 1000);
                     callback(null);
@@ -913,7 +917,7 @@ module.exports = function(RED) {
                       fill: 'green'
                     });
                     clearTimeout(node.timeout);
-                    node.timeout = setTimeout(function() {
+                    node.timeout = setTimeout(function () {
                       node.status({});
                     }, 10 * 1000);
                     callback(null);
@@ -963,7 +967,6 @@ module.exports = function(RED) {
       }
     } catch (err) {
       var error = "Homebridge not initialized";
-      node.error(error);
       node.status({
         text: error,
         shape: 'ring',
@@ -991,7 +994,7 @@ module.exports = function(RED) {
         "characteristics": device.eventRegisters
       };
       debug("_register", node.fullName, device.id, message);
-      homebridge.HAPeventByDeviceID(device.id, JSON.stringify(message), function(err, status) {
+      homebridge.HAPeventByDeviceID(device.id, JSON.stringify(message), function (err, status) {
         if (!err && status === null) {
           debug("%s registered: %s -> %s", node.type, node.fullName, device.id);
           callback(null);

package/README.md

@@ -9,51 +9,50 @@ The above Node-RED Flow, turns on my 'Outside Office' light when the powder room
 # Table of Contents
 
 <!--ts-->
-   * [Homebridge Automation powered by Node-RED](#homebridge-automation-powered-by-node-red)
-   * [Table of Contents](#table-of-contents)
-   * [Introduction](#introduction)
-      * [Caveats](#caveats)
-      * [Changes](#changes)
-         * [Mar 18, 2019 - Version 0.0.39](#mar-18-2019---version-0039)
-         * [Mar 19, 2019 - Version 0.0.42](#mar-19-2019---version-0042)
-         * [Mar 31, 2019 - Version 0.0.](#mar-31-2019---version-00)
-         * [May 9, 2019 - Version 0.0.43](#may-9-2019---version-0043)
-         * [May 15, 2019 - Version 0.0.44](#may-15-2019---version-0044)
-         * [May 29, 2019 - Version 0.0.45](#may-29-2019---version-0045)
-         * [July 27, 2019 - Version 0.0.50](#july-27-2019---version-0050)
-         * [Feb 24, 2020 - Version 0.0.56](#feb-24-2020---version-0056)
-         * [Mar 18, 2020 - Version 0.0.59](#mar-18-2020---version-0059)
-         * [Oct 13, 2020 - Version 0.0.71](#oct-13-2020---version-0071)
-         * [Oct 24, 2020 - Version 0.0.71](#oct-24-2020---version-0071)
-         * [Nov 1, 2020 - Version 0.0.73](#nov-1-2020---version-0073)
-         * [Nov 13, 2020 - Version 0.0.76](#nov-13-2020---version-0076)
-         * [Feb 2, 2021 - Version 0.0.78](#feb-2-2021---version-0078)
-         * [Mar 9, 2021 - Version 0.0.80](#mar-9-2021---version-0080)
-         * [April 23, 2021 - Version 0.0.82](#april-23-2021---version-0082)
-         * [April 23, 2022 - Version 0.0.86](#april-23-2022---version-0086)
-   * [Backlog / Roadmap](#backlog--roadmap)
-      * [Dropped items](#dropped-items)
-   * [Installation Steps](#installation-steps)
-      * [1 - Install Node-RED and Homebridge](#1---install-node-red-and-homebridge)
-      * [2 - Prepare Homebridge for integration with Homebridge-Automation](#2---prepare-homebridge-for-integration-with-homebridge-automation)
-      * [3 - Install Homebridge-Automation into Node-Red](#3---install-homebridge-automation-into-node-red)
-      * [4 - Start Node-Red](#4---start-node-red)
-      * [5 - Initial setup and configuration inside Node-Red](#5---initial-setup-and-configuration-inside-node-red)
-      * [6 - Configure 'hb event' to receive updates from your Accessories](#6---configure-hb-event-to-receive-updates-from-your-accessories)
-   * [Node-RED Homebridge-Automation Message Structure](#node-red-homebridge-automation-message-structure)
-      * [hb event](#hb-event)
-         * [Output](#output)
-      * [hb resume](#hb-resume)
-         * [input](#input)
-         * [output](#output-1)
-      * [hb status](#hb-status)
-         * [input](#input-1)
-         * [output](#output-2)
-      * [hb control](#hb-control)
-         * [Input](#input-2)
-   * [Flows Shared from Community](#flows-shared-from-community)
-   * [Troubleshooting / DEBUG MODE](#troubleshooting--debug-mode)
-      * [To start Node-RED in DEBUG mode, and output Homebridge-Automation debug logs start Node-RED like this.](#to-start-node-red-in-debug-mode-and-output-homebridge-automation-debug-logs-start-node-red-like-this)
+   * [Homebridge Automation powered by Node-RED]()
+   * [Table of Contents]()
+   * [Introduction]()
+      * [Caveats]()
+      * [Changes]()
+         * [Mar 18, 2019 - Version 0.0.39]()
+         * [Mar 19, 2019 - Version 0.0.42]()
+         * [Mar 31, 2019 - Version 0.0.]()
+         * [May 9, 2019 - Version 0.0.43]()
+         * [May 15, 2019 - Version 0.0.44]()
+         * [May 29, 2019 - Version 0.0.45]()
+         * [July 27, 2019 - Version 0.0.50]()
+         * [Feb 24, 2020 - Version 0.0.56]()
+         * [Mar 18, 2020 - Version 0.0.59]()
+         * [Oct 13, 2020 - Version 0.0.71]()
+         * [Oct 24, 2020 - Version 0.0.71]()
+         * [Nov 1, 2020 - Version 0.0.73]()
+         * [Nov 13, 2020 - Version 0.0.76]()
+         * [Feb 2, 2021 - Version 0.0.78]()
+         * [Mar 9, 2021 - Version 0.0.80]()
+         * [April 23, 2021 - Version 0.0.82]()
+   * [Backlog / Roadmap]()
+      * [Dropped items]()
+   * [Installation Steps]()
+      * [1 - Install Node-RED and Homebridge]()
+      * [2 - Prepare Homebridge for integration with Homebridge-Automation]()
+      * [3 - Install Homebridge-Automation into Node-Red]()
+      * [4 - Start Node-Red]()
+      * [5 - Initial setup and configuration inside Node-Red]()
+      * [6 - Configure 'hb event' to receive updates from your Accessories]()
+   * [Node-RED Homebridge-Automation Message Structure]()
+      * [hb event]()
+         * [Output]()
+      * [hb resume]()
+         * [input]()
+         * [output]()
+      * [hb status]()
+         * [input]()
+         * [output]()
+      * [hb control]()
+         * [Input]()
+   * [Flows Shared from Community]()
+   * [Troubleshooting / DEBUG MODE]()
+      * [To start Node-RED in DEBUG mode, and output Homebridge-Automation debug logs start Node-RED like this.]()
 
 <!-- Added by: sgracey, at:  -->
 
@@ -162,10 +161,6 @@ With a plugin, you can see if it supports Real Time events, by opening the Home
 
 - Support for homebridge instances with different PINS.  Tks @dxdc
 
-### April 23, 2022 - Version 0.0.86
-
-- Removal of request dependency from hap-node-client
-
 # Backlog / Roadmap
 
 * [x] - Update Node Information with Homebridge Accessory Details ( hapEndpoint, deviceType, description )

package/README.md.orig.2022-10-17_201716

@@ -0,0 +1,346 @@
+# Homebridge Automation powered by Node-RED
+
+<p align="center">
+    <img src="docs/Homebridge and Node Red.png"/>
+</p>
+
+The above Node-RED Flow, turns on my 'Outside Office' light when the powder room is turned on, and turns them both off after 10 seconds. Not practical but a good sample of the power behind Node-RED. [Link](docs/sample.json) to exported flow for above.
+
+# Table of Contents
+
+<!--ts-->
+   * [Homebridge Automation powered by Node-RED](#homebridge-automation-powered-by-node-red)
+   * [Table of Contents](#table-of-contents)
+   * [Introduction](#introduction)
+      * [Caveats](#caveats)
+      * [Changes](#changes)
+         * [Mar 18, 2019 - Version 0.0.39](#mar-18-2019---version-0039)
+         * [Mar 19, 2019 - Version 0.0.42](#mar-19-2019---version-0042)
+         * [Mar 31, 2019 - Version 0.0.](#mar-31-2019---version-00)
+         * [May 9, 2019 - Version 0.0.43](#may-9-2019---version-0043)
+         * [May 15, 2019 - Version 0.0.44](#may-15-2019---version-0044)
+         * [May 29, 2019 - Version 0.0.45](#may-29-2019---version-0045)
+         * [July 27, 2019 - Version 0.0.50](#july-27-2019---version-0050)
+         * [Feb 24, 2020 - Version 0.0.56](#feb-24-2020---version-0056)
+         * [Mar 18, 2020 - Version 0.0.59](#mar-18-2020---version-0059)
+         * [Oct 13, 2020 - Version 0.0.71](#oct-13-2020---version-0071)
+         * [Oct 24, 2020 - Version 0.0.71](#oct-24-2020---version-0071)
+         * [Nov 1, 2020 - Version 0.0.73](#nov-1-2020---version-0073)
+         * [Nov 13, 2020 - Version 0.0.76](#nov-13-2020---version-0076)
+         * [Feb 2, 2021 - Version 0.0.78](#feb-2-2021---version-0078)
+         * [Mar 9, 2021 - Version 0.0.80](#mar-9-2021---version-0080)
+         * [April 23, 2021 - Version 0.0.82](#april-23-2021---version-0082)
+   * [Backlog / Roadmap](#backlog--roadmap)
+      * [Dropped items](#dropped-items)
+   * [Installation Steps](#installation-steps)
+      * [1 - Install Node-RED and Homebridge](#1---install-node-red-and-homebridge)
+      * [2 - Prepare Homebridge for integration with Homebridge-Automation](#2---prepare-homebridge-for-integration-with-homebridge-automation)
+      * [3 - Install Homebridge-Automation into Node-Red](#3---install-homebridge-automation-into-node-red)
+      * [4 - Start Node-Red](#4---start-node-red)
+      * [5 - Initial setup and configuration inside Node-Red](#5---initial-setup-and-configuration-inside-node-red)
+      * [6 - Configure 'hb event' to receive updates from your Accessories](#6---configure-hb-event-to-receive-updates-from-your-accessories)
+   * [Node-RED Homebridge-Automation Message Structure](#node-red-homebridge-automation-message-structure)
+      * [hb event](#hb-event)
+         * [Output](#output)
+      * [hb resume](#hb-resume)
+         * [input](#input)
+         * [output](#output-1)
+      * [hb status](#hb-status)
+         * [input](#input-1)
+         * [output](#output-2)
+      * [hb control](#hb-control)
+         * [Input](#input-2)
+   * [Flows Shared from Community](#flows-shared-from-community)
+   * [Troubleshooting / DEBUG MODE](#troubleshooting--debug-mode)
+      * [To start Node-RED in DEBUG mode, and output Homebridge-Automation debug logs start Node-RED like this.](#to-start-node-red-in-debug-mode-and-output-homebridge-automation-debug-logs-start-node-red-like-this)
+
+<!-- Added by: sgracey, at:  -->
+
+<!--te-->
+
+# Introduction
+
+This is a release of the ability to integrate Homebridge Accessories into [Node-RED](https://nodered.org) so that you can start flows from Homebridge accessory events and control your existing homebridge accessories.  ( To create accessories in HomeKit, please use node-red-contrib-homekit-bridged. )
+
+![Homebridge Nodes](docs/Homebridge%20Nodes.png)
+
+Four different node types are available, the first node `hb event` listens for changes to an accessory (ie on/off) and sends a message into Node-Red containing the updated accessory status.  The second node `hb resume` holds the state of an accessory and supports creating a state resume function. The third node `hb status` allows you to poll an accessory for status. The forth node `hb control` allows you to control a homebridge accessory.  Each node is tied to an individual Home App Tile/Service of an accessory (ie on/off and brightness).
+
+Payload from a dimmable lightbulb.
+
+```
+{ "On":true, "Brightness":100 }
+```
+
+![Homebridge Nodes](docs/HAP%20Event%20Nodes.png)
+
+## Caveats
+
+* Please keep in mind that this integration only works with devices supported/exposed with HomeBridge Plugins.  This does not have visibility to Native HomeKit devices.  ( Similar to my homebridge-alexa plugin. )
+
+* For the `hb event` node, the ability of a Accessory to generate events in Real Time is dependent on how the plugin was architected and the actual device.  Some are very good at generating events in real time, and others only generate events when the Home App is opened to the accessory. YMMV.
+
+With a plugin, you can see if it supports Real Time events, by opening the Home App, and looking at an accessory.  Then trigger a local event outside of homebridge/homekit.  If the accessory updates in real time, then it support Real Events.  ( An example of a local event can be turning on a Smart Light Switch, by the local switch.  Another example would be using the vendor app to control an accessory.)
+
+## Changes
+
+### Mar 18, 2019 - Version 0.0.39
+
+- Changed `hb state` to `hb resume` to make the use case for the node more self-explanatory. If you had used the `hb state` node in your existing flow, nodeRed will not start unless you manually change the node type in the flow file.  To fix the issue, manually edit the flow file in your .node-red directory, and change the type reference `hb-state` to `hb resume`
+- Changed individual nodes from being characteristic based to device/service based.  When updating from previous versions, you will need to select your devices again.
+- With the change in nodes to be device/service based, the payload message structure changed from being individual characteristic based to a JSON object containing all the characteristics you want to update on the device.  ie in the previous version a device control message payload of `true` going to the On characteristic would turn on a light, with this version it would be be represented with a message payload of `{ "On":true, "Brightness":100 }`.  This particular payload would turn on a light and set the brightness to 100.  I made this change to enable easier intergradation with node-red-contrib-homekit-bridged.
+- If you send an incorrect message payload to the `hb resume` or `hb control` nodes it would output a debug message containing the valid/supported characteristics for use in the payload object.
+- Updated the Homebridge accessory parser, so more diverse devices will now be exposed.
+
+### Mar 19, 2019 - Version 0.0.42
+
+- Fix for events being missed after homebridge restarts
+
+### Mar 31, 2019 - Version 0.0.
+
+- Fix for a crash when events are received by an accessory with multiple services.
+
+### May 9, 2019 - Version 0.0.43
+
+- Added retries for registering of events during startup.  ( 1000 retries, retry delay of 30 seconds )
+
+### May 15, 2019 - Version 0.0.44
+
+- Added reqTimeout and set default timeout on homebridge requests to 14 seconds
+
+### May 29, 2019 - Version 0.0.45
+
+- Name Change to Homebridge-Automation
+
+### July 27, 2019 - Version 0.0.50
+
+- Publish as a NPM package to resolve #17
+
+### Feb 24, 2020 - Version 0.0.56
+
+- Fix for device naming for Nest FAN and ECO Mode
+
+### Mar 18, 2020 - Version 0.0.59
+
+- Support for the new version of HAP-NodeJS
+
+### Oct 13, 2020 - Version 0.0.71
+
+- Realize that I have not updated the change log for a while, so this is a laundry list of changes since 0.0.59
+- Additional error logging
+- Fix for issue #47 and #48
+- Support camera devices - tks dxdc
+- Improved timeout support
+- Support for the latest version of homebridge
+
+### Oct 24, 2020 - Version 0.0.71
+
+- Added support for plugins that allow device name editing within the Home app.
+
+### Nov 1, 2020 - Version 0.0.73
+
+- Added support for Air Pressure and Power devices
+- Fixed issue #69 TV accessory events not firing since update of homebridge-broadlink-rm plugin
+
+### Nov 13, 2020 - Version 0.0.76
+
+- Update HB Control Node to output snapshot images from camera's.  Payload output format is a buffer object containing image.
+
+### Feb 2, 2021 - Version 0.0.78
+
+- Change hb-control to display control message payload rather than 'Ok'
+- Tweak device parser to remove these duplicates
+    - Camera RTPStream Management
+    - Input Source with a name of 'dummy'
+
+### Mar 9, 2021 - Version 0.0.80
+
+- hbEvent: add option to send initial state
+
+### April 23, 2021 - Version 0.0.82
+
+- Support for homebridge instances with different PINS.  Tks @dxdc
+
+# Backlog / Roadmap
+
+* [x] - Update Node Information with Homebridge Accessory Details ( hapEndpoint, deviceType, description )
+* [x] - Sort device drop down listing
+* [x] - Trim Node name to just accessory Name
+* [x] - Documentation - Fix README with latest options
+* [x] - Documentation/Naming - Normalize on Accessory, Service, Event and Characteristic
+* [x] - Hap-Node-Client is not reentrant, and multiple requests get lost.  Needs queuing at an instance level.
+* [x] - Refactor interface with Hap-Node-Client, and split events into a dedicated evented socket connection and use the regular request module for everything else.
+* [x] - Create a service/characteristic based node approach mimicking homekit icons
+* [x] - Adjust msg.payload to match other homekit / NodeRED integrations
+* [ ] - Further stability testing
+* [ ] - With hb-event add a delay function of about 30ms to put back together device level events
+
+## Dropped items
+
+* [ ] - Add timestamp to Node msg object
+* [ ] - Do I need a node that emits events for all homebridge devices?
+
+# Installation Steps
+
+## 1 - Install Node-RED and Homebridge
+
+This is covered in alot of other places, so I won't cover it here.
+
+## 2 - Prepare Homebridge for integration with Homebridge-Automation
+
+Place your homebridge instances into "INSECURE MODE".  This is same as my [Homebridge Alexa](https://github.com/NorthernMan54/homebridge-alexa) plugin, and you just need to follow the [Prepare homebridge for plugin](https://github.com/NorthernMan54/homebridge-alexa#prepare-homebridge-for-plugin-installation) instructions there.
+
+## 3 - Install Homebridge-Automation into Node-Red
+
+    cd ~/.node-red
+    npm install node-red-contrib-homebridge-automation
+
+## 4 - Start Node-Red
+
+## 5 - Initial setup and configuration inside Node-Red
+
+* 5.1 Select 'hb event' node and place onto flow.
+* 5.2 Double click on hb event node ( now called 'Choose accessory/event')
+
+![Choose](docs/Choose.png)
+
+* 5.3 Please select the **pencil** to the right of the PIN Field.
+
+![Pencil](docs/Pencil.png)
+
+* 5.4 Please enter your PIN, and select **Add**.
+
+![Pin Entered](docs/Pin%20Entered.png)
+
+* 5.5 Now select **Done**.
+
+![Done](docs/HAP%20Event%20Done.png)
+
+* 5.6 Now select **Deploy**
+* 5.7 Please wait about 30 seconds.  ( Node-RED is busy discovering all your accessories.)
+* 5.8 Initial setup and config is complete.
+
+## 6 - Configure 'hb event' to receive updates from your Accessories
+
+* 6.1 Double click on hb event node ( now called 'Choose accessory/service')
+
+![Populated](docs/HAP%20Event%20Populated.png)
+
+* 6.2 The device drop down should now be populated with all your Homebridge accessories.
+
+![Populated](docs/HAP%20Event%20Drop%20Down.png)
+
+The accessory naming convention is:
+
+Accessory Name and Accessory Service Type
+
+# Node-RED Homebridge-Automation Message Structure
+
+## hb event
+
+This node generates a message every time an Accessory changes status, and generates a message containing the updated status of all the characteristics.
+
+### Output
+
+Message is structured like this
+
+```
+msg = {
+  name: Accessory Name,
+  payload: { "On":true, "Brightness":100 }
+  Homebridge: Homebridge instance name,
+  Manufacturer: Plugin Manufacturer,
+  Type: Homebridge device type,
+  _device: Unique device identifier,
+  _confId: node.confId,
+  _rawEvent: Raw event message
+};
+```
+
+Message payload will vary depending on characteristics support by the device, this example is from a dimmable light.
+
+Please note that multiple event messages may be received from a single device event, this is due to how homebridge controls devices and emits events.
+
+## hb resume
+
+This node can be used to create a resume previous state flow.  Where you change the state of an accessory, and have it resume the previous state afterwards.  I'm using this, in conjunction with Alexa to give the ability to turn on and off the lights in a room, but not turn any lights that were already on.  I'm also using it with the HomeKit "I'm home" automation, to turn a group of lights for a few minutes then turn off.  But at the same time have any lights you already had on, stay on.
+
+### input
+
+Based on the message input payload and state of the accessory the output changes.
+
+For  `{"On":true}`, the node just passes the message to output.  For the first `{"On":false}`, the output is the state of the accessory from prior to the last turn on.  For the second `{"On":false}`, the out is `{"On":false}`.
+
+```
+msg = {
+  payload: { "On":true, "Brightness":100 }
+};
+```
+
+### output
+
+```
+msg = {
+  payload: { "On":true, "Brightness":100 }
+};
+```
+Message payload will vary depending on characteristics support by the device, this sample is from a dimmable light.
+
+To find supported characteristics for a device, please send an invalid message payload to the node, and it will output the supported characteristics in the debug log.
+
+## hb status
+
+This node allows you to poll a Homebridge accessory and collect the current status of all the characteristics.
+
+### input
+
+Anything
+
+### output
+
+Message is structured like this
+
+```
+msg = {
+  name: Accessory Name,
+  payload: { "On":true, "Brightness":100 }
+  Homebridge: Homebridge instance name,
+  Manufacturer: Plugin Manufacturer,
+  Type: Homebridge device type,
+  _device: Unique device identifier,
+  _confId: node.confId,
+  _rawEvent: Raw event message
+};
+```
+Message payload will vary depending on characteristics support by the device, this sample is from a dimmable light.
+
+## hb control
+
+This node allows you to control all the characteristics of a Homebridge accessory.  The message payload needs to be a JSON object containing the values of all the characteristics you want to change.  If you send the node an invalid payload, it will output all the available characteristics of the accessory in the debug tab.
+
+### Input
+
+The hb control node only looks at msg.payload value, and ignore's all others.
+
+```
+msg = {
+        payload: { "On":true, "Brightness":100 }
+      }
+```
+Message payload will vary depending on characteristics support by the device, this sample is from a dimmable light.
+
+To find supported characteristics for a device, please send an invalid message payload to the node, and it will output the supported characteristics in the debug log.
+
+# Flows Shared from Community
+
+I have started collecting flows for useful functions on the wiki.
+
+https://github.com/NorthernMan54/node-red-contrib-homebridge-automation/wiki
+
+# Troubleshooting / DEBUG MODE
+
+## To start Node-RED in DEBUG mode, and output Homebridge-Automation debug logs start Node-RED like this.
+
+```
+DEBUG=-express*,-send*,-body-parser*,* node-red
+```

package/README.md.toc.2022-10-17_201716

@@ -0,0 +1,47 @@
+   * [Homebridge Automation powered by Node-RED]()
+   * [Table of Contents]()
+   * [Introduction]()
+      * [Caveats]()
+      * [Changes]()
+         * [Mar 18, 2019 - Version 0.0.39]()
+         * [Mar 19, 2019 - Version 0.0.42]()
+         * [Mar 31, 2019 - Version 0.0.]()
+         * [May 9, 2019 - Version 0.0.43]()
+         * [May 15, 2019 - Version 0.0.44]()
+         * [May 29, 2019 - Version 0.0.45]()
+         * [July 27, 2019 - Version 0.0.50]()
+         * [Feb 24, 2020 - Version 0.0.56]()
+         * [Mar 18, 2020 - Version 0.0.59]()
+         * [Oct 13, 2020 - Version 0.0.71]()
+         * [Oct 24, 2020 - Version 0.0.71]()
+         * [Nov 1, 2020 - Version 0.0.73]()
+         * [Nov 13, 2020 - Version 0.0.76]()
+         * [Feb 2, 2021 - Version 0.0.78]()
+         * [Mar 9, 2021 - Version 0.0.80]()
+         * [April 23, 2021 - Version 0.0.82]()
+   * [Backlog / Roadmap]()
+      * [Dropped items]()
+   * [Installation Steps]()
+      * [1 - Install Node-RED and Homebridge]()
+      * [2 - Prepare Homebridge for integration with Homebridge-Automation]()
+      * [3 - Install Homebridge-Automation into Node-Red]()
+      * [4 - Start Node-Red]()
+      * [5 - Initial setup and configuration inside Node-Red]()
+      * [6 - Configure 'hb event' to receive updates from your Accessories]()
+   * [Node-RED Homebridge-Automation Message Structure]()
+      * [hb event]()
+         * [Output]()
+      * [hb resume]()
+         * [input]()
+         * [output]()
+      * [hb status]()
+         * [input]()
+         * [output]()
+      * [hb control]()
+         * [Input]()
+   * [Flows Shared from Community]()
+   * [Troubleshooting / DEBUG MODE]()
+      * [To start Node-RED in DEBUG mode, and output Homebridge-Automation debug logs start Node-RED like this.]()
+
+<!-- Added by: sgracey, at:  -->
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-homebridge-automation",
-  "version": "0.0.86-beta.2",
+  "version": "0.0.86",
   "description": "NodeRED Automation for HomeBridge",
   "main": "HAP-NodeRed.js",
   "scripts": {
@@ -22,12 +22,12 @@
     "url": "git+https://github.com/NorthernMan54/node-red-contrib-homebridge-automation.git"
   },
   "devDependencies": {
-    "documentation": "^13.2.5"
+    "documentation": "13.2.4"
   },
   "dependencies": {
-    "better-queue": ">=3.8.10",
     "debug": ">2.6.9",
-    "hap-node-client": ">=0.1.22-beta.2"
+    "hap-node-client": ">=0.1.14",
+    "better-queue": ">=3.8.10"
   },
   "author": "NorthernMan54",
   "license": "ISC",

package/beta.sh

@@ -1,16 +0,0 @@
-#! /bin/sh
-
-npm audit
-npm audit fix
-#if npm audit; then
-  npm run-script document
-  rm *orig* *toc\.*
-  git add .
-  # npm version patch -m "$1" --force
-  npm version prerelease --preid beta -m "$1" --force
-  npm publish --tag beta
-  git commit -m "$1"
-  git push origin beta --tags
-#else
-#  echo "Not publishing due to security vulnerabilites"
-#fi