node-red-contrib-homebridge-automation 0.1.12-beta.14 → 0.1.12-beta.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-homebridge-automation",
-  "version": "0.1.12-beta.14",
+  "version": "0.1.12-beta.16",
   "description": "NodeRED Automation for HomeBridge",
   "main": "src/HAP-NodeRed.js",
   "scripts": {
@@ -62,7 +62,7 @@
     ],
     "ext": "js,html",
     "ignore": [],
-    "exec": "DEBUG=hapNodeRed ~/npm/bin/node-red -u test/node-red",
+    "exec": "DEBUG=hapNodeRed* ~/npm/bin/node-red -u test/node-red",
     "signal": "SIGTERM",
     "env": {
       "NODE_OPTIONS": "--trace-warnings"

package/src/HAP-NodeRed.html

@@ -52,14 +52,14 @@
       // var pass = $('#node-config-input-password').val();
       // console.log("pass: ", pass);
       // if (pass != '_PWD_') {
-      //  var account = {
+      //  var configNode = {
       //    id: node.id,
       //    user: user,
       //    pass: pass
       //  }
       // $.ajax({
-      //  data: JSON.stringify(account),
-      //  url: 'alexa-home/new-account',
+      //  data: JSON.stringify(configNode),
+      //  url: 'alexa-home/new-configNode',
       //  contentType: 'application/json',
       //  type: 'POST',
       //  processData: false
@@ -167,14 +167,14 @@
     oneditprepare: function() {
       var node = this;
       // console.log("foo " + node.device);
-      if (typeof node.acknoledge === 'undefined') {
-        $('#node-input-acknoledge').prop('checked', true);
+      if (typeof node.acknowledge === 'undefined') {
+        $('#node-input-acknowledge').prop('checked', true);
       }
       $('#node-input-device').change(function() {
         $('#node-input-name').val($('#node-input-device option:selected').text());
       });
-      var getDevs = function(account) {
-        $.getJSON('hap-device/evDevices/' + account, function(data) {
+      var getDevs = function(configNode) {
+        $.getJSON('hap-device/evDevices/' + configNode, function(data) {
           $('#node-input-device').find('option').remove().end();
           for (d in data) {
             $('<option/>', {
@@ -196,32 +196,32 @@
 
       }
       if (node.conf) {
-        var account = $('#node-input-conf').val();
-        // console.log("account: ", account);
-        if (account != '_ADD_') {
-          getDevs(account);
+        var configNode = $('#node-input-conf').val();
+        // console.log("configNode: ", configNode);
+        if (configNode != '_ADD_') {
+          getDevs(configNode);
         }
       }
       $('#node-input-conf').change(function() {
-        var account = $('#node-input-conf').val();
-        // console.log("account changed: ", account);
-        if (account != '_ADD_') {
-          getDevs(account);
+        var configNode = $('#node-input-conf').val();
+        // console.log("configNode changed: ", configNode);
+        if (configNode != '_ADD_') {
+          getDevs(configNode);
         } else {
-          // console.log("new account");
+          // console.log("new configNode");
           $('#node-input-device').find('option').remove().end();
           $('#node-input-device').val("");
         }
       });
       $('#node-input-device-refresh').click(function() {
         $('#node-input-device-refresh').addClass('disabled');
-        var account = $('#node-input-conf').val();
+        var configNode = $('#node-input-conf').val();
         $.ajax({
-          url: 'hap-device/refresh/' + account,
+          url: 'hap-device/refresh/' + configNode,
           type: 'POST'
         }).done(function(data) {
           setTimeout(function() {
-            getDevs(account);
+            getDevs(configNode);
             $('#node-input-device-refresh').removeClass('disabled');
           }, 3000);
         });
@@ -317,15 +317,15 @@
     oneditprepare: function() {
       var node = this;
       // console.log("foo " + node.device);
-      if (typeof node.acknoledge === 'undefined') {
+      if (typeof node.acknowledge === 'undefined') {
         // console.log("ben");
-        $('#node-input-acknoledge').prop('checked', true);
+        $('#node-input-acknowledge').prop('checked', true);
       }
       $('#node-input-device').change(function() {
         $('#node-input-name').val($('#node-input-device option:selected').text());
       });
-      var getDevs = function(account) {
-        $.getJSON('hap-device/evDevices/' + account, function(data) {
+      var getDevs = function(configNode) {
+        $.getJSON('hap-device/evDevices/' + configNode, function(data) {
           $('#node-input-device').find('option').remove().end();
           for (d in data) {
             $('<option/>', {
@@ -348,32 +348,32 @@
 
       }
       if (node.conf) {
-        var account = $('#node-input-conf').val();
-        // console.log("account: ", account);
-        if (account != '_ADD_') {
-          getDevs(account);
+        var configNode = $('#node-input-conf').val();
+        // console.log("configNode: ", configNode);
+        if (configNode != '_ADD_') {
+          getDevs(configNode);
         }
       }
       $('#node-input-conf').change(function() {
-        var account = $('#node-input-conf').val();
-        // console.log("account changed: ", account);
-        if (account != '_ADD_') {
-          getDevs(account);
+        var configNode = $('#node-input-conf').val();
+        // console.log("configNode changed: ", configNode);
+        if (configNode != '_ADD_') {
+          getDevs(configNode);
         } else {
-          // console.log("new account");
+          // console.log("new configNode");
           $('#node-input-device').find('option').remove().end();
           $('#node-input-device').val("");
         }
       });
       $('#node-input-device-refresh').click(function() {
         $('#node-input-device-refresh').addClass('disabled');
-        var account = $('#node-input-conf').val();
+        var configNode = $('#node-input-conf').val();
         $.ajax({
-          url: 'hap-device/refresh/' + account,
+          url: 'hap-device/refresh/' + configNode,
           type: 'POST'
         }).done(function(data) {
           setTimeout(function() {
-            getDevs(account);
+            getDevs(configNode);
             $('#node-input-device-refresh').removeClass('disabled');
           }, 3000);
         });
@@ -467,15 +467,15 @@
     oneditprepare: function() {
       var node = this;
       // console.log("foo " + node.device);
-      if (typeof node.acknoledge === 'undefined') {
+      if (typeof node.acknowledge === 'undefined') {
         // console.log("ben");
-        $('#node-input-acknoledge').prop('checked', true);
+        $('#node-input-acknowledge').prop('checked', true);
       }
       $('#node-input-device').change(function() {
         $('#node-input-name').val($('#node-input-device option:selected').text());
       });
-      var getDevs = function(account) {
-        $.getJSON('hap-device/evDevices/' + account, function(data) {
+      var getDevs = function(configNode) {
+        $.getJSON('hap-device/evDevices/' + configNode, function(data) {
           $('#node-input-device').find('option').remove().end();
           for (d in data) {
             $('<option/>', {
@@ -498,32 +498,32 @@
 
       }
       if (node.conf) {
-        var account = $('#node-input-conf').val();
-        // console.log("account: ", account);
-        if (account != '_ADD_') {
-          getDevs(account);
+        var configNode = $('#node-input-conf').val();
+        // console.log("configNode: ", configNode);
+        if (configNode != '_ADD_') {
+          getDevs(configNode);
         }
       }
       $('#node-input-conf').change(function() {
-        var account = $('#node-input-conf').val();
-        // console.log("account changed: ", account);
-        if (account != '_ADD_') {
-          getDevs(account);
+        var configNode = $('#node-input-conf').val();
+        // console.log("configNode changed: ", configNode);
+        if (configNode != '_ADD_') {
+          getDevs(configNode);
         } else {
-          // console.log("new account");
+          // console.log("new configNode");
           $('#node-input-device').find('option').remove().end();
           $('#node-input-device').val("");
         }
       });
       $('#node-input-device-refresh').click(function() {
         $('#node-input-device-refresh').addClass('disabled');
-        var account = $('#node-input-conf').val();
+        var configNode = $('#node-input-conf').val();
         $.ajax({
-          url: 'hap-device/refresh/' + account,
+          url: 'hap-device/refresh/' + configNode,
           type: 'POST'
         }).done(function(data) {
           setTimeout(function() {
-            getDevs(account);
+            getDevs(configNode);
             $('#node-input-device-refresh').removeClass('disabled');
           }, 3000);
         });
@@ -620,15 +620,15 @@
     oneditprepare: function() {
       var node = this;
       // console.log("foo " + node.device);
-      if (typeof node.acknoledge === 'undefined') {
+      if (typeof node.acknowledge === 'undefined') {
         // console.log("ben");
-        $('#node-input-acknoledge').prop('checked', true);
+        $('#node-input-acknowledge').prop('checked', true);
       }
       $('#node-input-device').change(function() {
         $('#node-input-name').val($('#node-input-device option:selected').text());
       });
-      var getDevs = function(account) {
-        $.getJSON('hap-device/ctDevices/' + account, function(data) {
+      var getDevs = function(configNode) {
+        $.getJSON('hap-device/ctDevices/' + configNode, function(data) {
           $('#node-input-device').find('option').remove().end();
           for (d in data) {
             $('<option/>', {
@@ -651,32 +651,32 @@
 
       }
       if (node.conf) {
-        var account = $('#node-input-conf').val();
-        // console.log("account: ", account);
-        if (account != '_ADD_') {
-          getDevs(account);
+        var configNode = $('#node-input-conf').val();
+        // console.log("configNode: ", configNode);
+        if (configNode != '_ADD_') {
+          getDevs(configNode);
         }
       }
       $('#node-input-conf').change(function() {
-        var account = $('#node-input-conf').val();
-        // console.log("account changed: ", account);
-        if (account != '_ADD_') {
-          getDevs(account);
+        var configNode = $('#node-input-conf').val();
+        // console.log("configNode changed: ", configNode);
+        if (configNode != '_ADD_') {
+          getDevs(configNode);
         } else {
-          // console.log("new account");
+          // console.log("new configNode");
           $('#node-input-device').find('option').remove().end();
           $('#node-input-device').val("");
         }
       });
       $('#node-input-device-refresh').click(function() {
         $('#node-input-device-refresh').addClass('disabled');
-        var account = $('#node-input-conf').val();
+        var configNode = $('#node-input-conf').val();
         $.ajax({
-          url: 'hap-device/refresh/' + account,
+          url: 'hap-device/refresh/' + configNode,
           type: 'POST'
         }).done(function(data) {
           setTimeout(function() {
-            getDevs(account);
+            getDevs(configNode);
             $('#node-input-device-refresh').removeClass('disabled');
           }, 3000);
         });

package/src/HAP-NodeRed.js

@@ -2,7 +2,7 @@ var debug = require('debug')('hapNodeRed');
 
 // var register = require('./lib/register.js');
 
-const HBConfNode = require('./hbConfigNode');
+const HBConfigNode = require('./hbConfigNode');
 const HbEventNode = require('./hbEventNode'); // Import the class
 const HbResumeNode = require('./hbResumeNode'); // Import the class
 const HbControlNode = require('./hbControlNode');
@@ -23,20 +23,15 @@ module.exports = function (RED) {
    * @return {type}   description
    */
 
-  function hbConfNode(n) {
-    RED.nodes.createNode(this, n);
-    this.username = n.username;
-    this.macAddress = n.macAddress || '';
-    this.password = this.credentials.password;
-
-    this.hbConf = new HBConfNode(n, RED); // Initialize the class instance
-
-    this.on('close', function () {
-      this.hbConf.close(); // Close any open connections
-    });
+  class hbConfigNode extends HBConfigNode {
+    constructor(config) {
+      debug('hbConfigNode', config);
+      super(config, RED);
+    }
   }
 
-  RED.nodes.registerType("hb-conf", hbConfNode, {
+  // console.log('Registering node types', "hb-conf", hbConfigNode);
+  RED.nodes.registerType("hb-conf", hbConfigNode, {
     credentials: {
       password: {
         type: "password"
@@ -44,15 +39,16 @@ module.exports = function (RED) {
     }
   });
 
+
   /**
    *  hbEventNode - description
    * @param {*} n 
    */
-  function hbEventNode(n) {
-    RED.nodes.createNode(this, n);
-
-    // Create instance of HbEventNode class to handle events
-    new HbEventNode(this, n); // Pass current node and config object
+  class hbEventNode extends HbEventNode {
+    constructor(config) {
+      debug('hbEventNode', config);
+      super(config, RED);
+    }
   }
 
   RED.nodes.registerType("hb-event", hbEventNode);
@@ -60,20 +56,20 @@ module.exports = function (RED) {
   /**
    * hbResumeNode - description
    */
-  function hbResumeNode(n) {
-    RED.nodes.createNode(this, n);
-
-    // Create instance of HbEventNode class to handle events
-    new HbResumeNode(this, n); // Pass current node and config object
+  class hbResumeNode extends HbResumeNode {
+    constructor(config) {
+      debug('hbResumeNode', config);
+      super(config, RED);
+    }
   }
 
   RED.nodes.registerType("hb-resume", hbResumeNode);
 
-  function hbControlNode(n) {
-    RED.nodes.createNode(this, n);
-
-    // Create instance of HbEventNode class to handle events
-    new HbControlNode(this, n); // Pass current node and config object
+  class hbControlNode extends HbControlNode {
+    constructor(config) {
+      debug('hbControlNode', config);
+      super(config, RED);
+    }
   }
 
   RED.nodes.registerType("hb-control", hbControlNode);
@@ -84,18 +80,16 @@ module.exports = function (RED) {
    * @param  {type} n description
    * @return {type}   description
    */
-
-
-  function hbStatusNode(n) {
-    RED.nodes.createNode(this, n);
-
-    // Create instance of HbEventNode class to handle events
-    new HbStatusNode(this, n); // Pass current node and config object
+  class hbStatusNode extends HbStatusNode {
+    constructor(config) {
+      debug('hbStatusNode', config);
+      super(config, RED);
+    }
   }
 
   RED.nodes.registerType("hb-status", hbStatusNode);
 
-  const hapDeviceRoutes = new HapDeviceRoutes(RED, hbDevices, debug);
+  const hapDeviceRoutes = new HapDeviceRoutes(RED, hbDevices);
   hapDeviceRoutes.registerRoutes();
 
 };

package/src/HapDeviceRoutes.js

@@ -1,10 +1,10 @@
 // HapDeviceRoutes.js
+const debug = require('debug')('hapNodeRed:HapDeviceRoutes');
 
 class HapDeviceRoutes {
-  constructor(RED, hbDevices, debug) {
+  constructor(RED) {
     this.RED = RED;
-    this.hbDevices = hbDevices;
-    this.debug = debug;
+    this.hbDevices = false;  // remove this line
   }
 
   // POST /hap-device/refresh/:id
@@ -14,14 +14,14 @@ class HapDeviceRoutes {
     if (conf) {
       res.status(200).send();
     } else {
-      console.log("Can't refresh until deployed");
+      debug("Can't refresh until deployed");
       res.status(404).send();
     }
   }
 
   // GET /hap-device/evDevices/
   getEvDevices(req, res) {
-    this.debug("evDevices", this.hbDevices.toList({ perms: 'ev' }).length);
+    debug("evDevices", this.hbDevices.toList({ perms: 'ev' }).length);
     if (this.hbDevices) {
       res.send(this.hbDevices.toList({ perms: 'ev' }));
     } else {
@@ -31,9 +31,12 @@ class HapDeviceRoutes {
 
   // GET /hap-device/evDevices/:id
   getEvDeviceById(req, res) {
-    this.debug("evDevices", this.hbDevices.toList({ perms: 'ev' }).length);
-    if (this.hbDevices) {
-      res.send(this.hbDevices.toList({ perms: 'ev' }));
+    debug('req', req.params.id);
+    var evDevices = this.RED.nodes.getNode(req.params.id).evDevices;
+    debug('hbDevices', evDevices);
+    debug("evDevices", evDevices.length);
+    if (evDevices) {
+      res.send(evDevices);
     } else {
       res.status(404).send();
     }
@@ -46,14 +49,14 @@ class HapDeviceRoutes {
     if (conf) {
       res.status(200).send();
     } else {
-      console.log("Can't refresh until deployed");
+      debug("Can't refresh until deployed");
       res.status(404).send();
     }
   }
 
   // GET /hap-device/evDevices/ for hb-resume
   getEvDevicesForResume(req, res) {
-    this.debug("evDevices", this.hbDevices.toList({ perms: 'ev' }).length);
+    debug("evDevices", this.hbDevices.toList({ perms: 'ev' }).length);
     if (this.hbDevices) {
       res.send(this.hbDevices.toList({ perms: 'ev' }));
     } else {
@@ -63,7 +66,7 @@ class HapDeviceRoutes {
 
   // GET /hap-device/evDevices/:id for hb-resume
   getEvDeviceByIdForResume(req, res) {
-    this.debug("evDevices", this.hbDevices.toList({ perms: 'ev' }).length);
+    debug("evDevices", this.hbDevices.toList({ perms: 'ev' }).length);
     if (this.hbDevices) {
       res.send(this.hbDevices.toList({ perms: 'ev' }));
     } else {
@@ -73,7 +76,7 @@ class HapDeviceRoutes {
 
   // GET /hap-device/ctDevices/
   getCtDevices(req, res) {
-    this.debug("ctDevices", this.hbDevices.toList({ perms: 'pw' }).length);
+    debug("ctDevices", this.hbDevices.toList({ perms: 'pw' }).length);
     if (this.hbDevices) {
       res.send(this.hbDevices.toList({ perms: 'pw' }));
     } else {
@@ -81,16 +84,29 @@ class HapDeviceRoutes {
     }
   }
 
-  // GET /hap-device/ctDevices/:id
+  // GET /hap-device/evDevices/:id
   getCtDeviceById(req, res) {
-    this.debug("ctDevices", this.hbDevices.toList({ perms: 'pw' }).length);
-    if (this.hbDevices) {
-      res.send(this.hbDevices.toList({ perms: 'pw' }));
+    debug('getCtDeviceById', req.params.id);
+    const ctDevices = this.RED.nodes.getNode(req.params.id).ctDevices;
+    debug('ctDevices', ctDevices);
+    debug("ctDevices", ctDevices.length);
+    if (ctDevices) {
+      res.send(ctDevices);
     } else {
       res.status(404).send();
     }
   }
 
+  // GET /hap-device/ctDevices/:id
+  //  getCtDeviceById(req, res) {
+  //    debug("ctDevices", this.hbDevices.toList({ perms: 'pw' }).length);
+  //    if (this.hbDevices) {
+  //      res.send(this.hbDevices.toList({ perms: 'pw' }));
+  //    } else {
+  //      res.status(404).send();
+  //    }
+  // }
+
   // Register all routes
   registerRoutes() {
     this.RED.httpAdmin.post('/hap-device/refresh/:id', this.RED.auth.needsPermission('hb-event.read'), this.refreshDevice.bind(this));

package/src/hbBaseNode.js

@@ -1,22 +1,22 @@
 const debug = require('debug')('hapNodeRed:hbBaseNode');
 
 class HbBaseNode {
-  constructor(nodeConfig, RED) {
-    RED.nodes.createNode(this, nodeConfig);
-
-    this.conf = RED.nodes.getNode(nodeConfig.conf); // The configuration node
-    this.confId = nodeConfig.conf;
-    this.device = nodeConfig.device;
-    this.service = nodeConfig.Service;
-    this.name = nodeConfig.name;
-    this.fullName = `${nodeConfig.name} - ${nodeConfig.Service}`;
-
-    this.hbDevice = null;
-
-    // Register the node with the configuration
-    this.conf.register(this, this.registerNode.bind(this));
-
-    // Set up the close event
+  constructor(config, RED) {
+    debug("HbBaseNode - constructor", config);
+    // RED.nodes.createNode(this, config);
+    RED.nodes.createNode(this, config);
+    this.hbConfigNode = RED.nodes.getNode(config.conf); // The configuration node
+    // console.log("HbBaseNode - conf", this.conf);
+    this.config = config;
+    this.confId = config.conf;
+    this.device = config.device;
+    this.service = config.Service;
+    this.name = config.name;
+    this.fullName = `${config.name} - ${config.Service}`;
+
+    this.node = this;
+
+    this.on('input', this.handleInput.bind(this));
     this.on('close', this.handleClose.bind(this));
   }
 
@@ -117,10 +117,11 @@ class HbBaseNode {
    * @returns 
    */
   async _status(nrDevice, node, perms) {
+    debug("_status", nrDevice);
     let error;
     try {
-      if (!hbDevices) {
-        throw new Error('hbDevices not initialized');
+      if (!this.hbDevices) {
+        throw new Error('_status hbDevices not initialized');
       }
 
       const device = hbDevices.findDevice(node.device, perms);
@@ -187,13 +188,14 @@ class HbBaseNode {
         throw new Error(error);
       }
     } catch (err) {
+      debug("Error in _status:", err);
       error = "Homebridge not initialized -2";
       node.status({
         text: error,
         shape: 'ring',
         fill: 'red'
       });
-      throw new Error(error);
+      // throw new Error(error);
     }
   }
 
@@ -204,8 +206,9 @@ class HbBaseNode {
    * @returns 
    */
   async _control(node, payload) {
+    debug("_control", node, payload);
     try {
-      if (!hbDevices) {
+      if (!this.hbDevices) {
         throw new Error('hbDevices not initialized');
       }
 
@@ -292,30 +295,32 @@ class HbBaseNode {
         throw new Error('Device not available');
       }
     } catch (err) {
+      debug("Error in _control:", err);
       let error = err.message || "Homebridge not initialized - 3";
       node.status({
         text: error,
         shape: 'ring',
         fill: 'red'
       });
-      throw new Error(error);
+      // throw new Error(error);
     }
   }
 
   async _register(node) {
+    debug("_register", node.device);
     try {
       debug("_register", node.device);
       const device = hbDevices.findDevice(node.device, { perms: 'ev' });
-  
+
       if (node.type === 'hb-event' || node.type === 'hb-resume') {
         const message = {
           "characteristics": device.eventRegisters
         };
         debug("_register", node.fullName, device.id, message);
-  
+
         // Use the shared async function here
         const status = await hapEventByDeviceIDAsync(device.id, JSON.stringify(message));
-  
+
         // Check the result of the operation
         if (status === null) {
           debug("%s registered: %s -> %s", node.type, node.fullName, device.id);
@@ -334,7 +339,7 @@ class HbBaseNode {
       });
     }
   }
-  
+
   _getObjectDiff(obj1, obj2) {
     const diff = Object.keys(obj1).reduce((result, key) => {
       if (!obj2.hasOwnProperty(key)) {