node-red-contrib-homebridge-automation 0.1.12-beta.4 → 0.1.12-beta.6

package/README.md

@@ -60,7 +60,7 @@ The above Node-RED Flow, turns on my 'Outside Office' light when the powder room
    * [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)
 
 <!-- Created by https://github.com/ekalinin/github-markdown-toc -->
-<!-- Added by: runner, at: Sat Jul  6 00:44:15 UTC 2024 -->
+<!-- Added by: runner, at: Sat Jul  6 02:33:18 UTC 2024 -->
 
 <!--te-->
 

package/package.json

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

package/src/HAP-NodeRed.js

@@ -194,7 +194,7 @@ module.exports = function (RED) {
           _rawEvent: event
         };
         node.status({
-          text: JSON.stringify(msg.payload).slice(0, 40)+'...',
+          text: JSON.stringify(msg.payload).slice(0, 30) + '...',
           shape: 'dot',
           fill: 'green'
         });
@@ -233,7 +233,7 @@ module.exports = function (RED) {
         }, function (err, message) {
           if (!err) {
             node.state = _convertHBcharactericToNode(message.characteristics, node);
-            debug("hbEvent received: %s = %s", node.fullName, JSON.stringify(message.characteristics).slice(0, 80)+'...');
+            debug("hbEvent received: %s = %s", node.fullName, JSON.stringify(message.characteristics).slice(0, 80) + '...');
             if (node.sendInitialState) {
               var msg = {
                 name: node.name,
@@ -246,7 +246,7 @@ module.exports = function (RED) {
                 _rawMessage: message,
               };
               node.status({
-                text: JSON.stringify(msg.payload).slice(0, 40)+'...',
+                text: JSON.stringify(msg.payload).slice(0, 30) + '...',
                 shape: 'dot',
                 fill: 'green'
               });
@@ -366,7 +366,7 @@ module.exports = function (RED) {
             }, newMsg));
             debug("hbResume.input: %s output", node.fullName, JSON.stringify(newMsg));
             node.status({
-              text: JSON.stringify(newMsg.payload).slice(0, 40)+'...',
+              text: JSON.stringify(newMsg.payload).slice(0, 30) + '...',
               shape: 'dot',
               fill: 'green'
             });
@@ -380,9 +380,9 @@ module.exports = function (RED) {
             node.lastPayload = JSON.parse(JSON.stringify(msg.payload)); // store value not reference
           }
         } else {
-          node.error("Homebridge not initialized", this.msg);
+          node.error("Homebridge not initialized - 1", this.msg);
           node.status({
-            text: 'Homebridge not initialized',
+            text: 'Homebridge not initialized -1',
             shape: 'ring',
             fill: 'red'
           });
@@ -448,7 +448,7 @@ module.exports = function (RED) {
         }, function (err, message) {
           if (!err) {
             node.state = _convertHBcharactericToNode(message.characteristics, node);
-            debug("hbResume received: %s = %s", node.fullName, JSON.stringify(message.characteristics).slice(0, 80)+'...');
+            debug("hbResume received: %s = %s", node.fullName, JSON.stringify(message.characteristics).slice(0, 80) + '...');
           } else {
             node.error(err);
           }
@@ -505,37 +505,26 @@ module.exports = function (RED) {
 
     node.on('input', function (msg) {
       this.msg = msg;
-      var device;
-
-      try {
-        if (msg.name) {
-          device = hbDevices.findDeviceByName(msg.name, {
-            perms: 'pw'
-          });
-        } else {
-          device = hbDevices.findDevice(node.device, {
-            perms: 'pw'
-          });
-        }
-      } catch (err) {
-        var error = "Homebridge not initialized";
-        node.status({
-          text: error,
-          shape: 'ring',
-          fill: 'red'
-        });
-        node.error(error, this.msg);
-        return;
-      }
-
-      _control.call(this, node, device, msg.payload, function (err, data) {
-        // debug('hbControl [%s] - [%s]', err, data); // Images produce alot of noise
-        if (!err && data && (device.type == '00000110' || device.type == '00000111')) {
-          // debug('hbControl', err, data); // Images produce alot of noise
-          const msg = {};
+      Object.keys(msg.payload).sort().forEach(function (key) {
+        payload[key] = msg.payload[key];
+      });
+      _control.call(this, node, msg.payload, function (err, data) {
+        // debug('hbControl complete [%s] - [%s]', node, node.hbDevice); // Images produce alot of noise
+        if (!err && data && (node.deviceType == '00000110' || node.deviceType == '00000111')) {
+          const msg = {
+            name: node.name,
+            payload: node.state,
+            _device: node.device,
+            _confId: node.confId
+          };
+          if (node.hbDevice) {
+            msg.Homebridge = node.hbDevice.homebridge;
+            msg.Manufacturer = node.hbDevice.manufacturer;
+            msg.Service = node.hbDevice.deviceType;
+          }
           msg.payload = data;
           node.send(msg);
-        } else {
+        } else if (err) {
           node.error(err, this.msg);
         }
       }.bind(this));
@@ -547,7 +536,19 @@ module.exports = function (RED) {
     });
 
     node.conf.register(node, function () {
-      // debug("hbControl.register:", node.fullName, node);
+      debug("hbControl.register:", node.fullName);
+      this.hbDevice = hbDevices.findDevice(node.device);
+      console.log('hbControl Register', this.hbDevice)
+      if (this.hbDevice) {
+        node.hbDevice = this.hbDevice;
+        node.deviceType = this.hbDevice.type;
+        // Register for events
+        node.listener = node.command;
+        // node.eventName = this.hbDevice.host + this.hbDevice.port + this.hbDevice.aid;
+      } else {
+        node.error("437:Can't find device " + node.device, null);
+        // this.error("Missing device " + node.device);
+      }
       switch (node.service) {
         case "Camera Control": // Camera Control
           debug("hbControl camera");
@@ -599,7 +600,7 @@ module.exports = function (RED) {
         perms: 'pr'
       }, function (err, message) {
         if (!err) {
-          debug("hbStatus received: %s = %s", JSON.stringify(node.fullName), JSON.stringify(message).slice(0, 80)+'...', JSON.stringify(node.hbDevice));
+          debug("hbStatus received: %s = %s", JSON.stringify(node.fullName), JSON.stringify(message).slice(0, 80) + '...', JSON.stringify(node.hbDevice));
           this.msg.name = node.name;
           this.msg._rawMessage = message;
           this.msg.payload = _convertHBcharactericToNode(message.characteristics, node);
@@ -612,7 +613,7 @@ module.exports = function (RED) {
             this.msg._confId = node.confId;
           }
           node.status({
-            text: JSON.stringify(this.msg.payload).slice(0, 40)+'...',
+            text: JSON.stringify(this.msg.payload).slice(0, 30) + '...',
             shape: 'dot',
             fill: 'green'
           });
@@ -815,6 +816,9 @@ module.exports = function (RED) {
     // debug("_status", new Error(), hbDevices);
     var error;
     try {
+      if (!hbDevices) {
+        throw new Error('hbDevices not initialized');
+      }
       var device = hbDevices.findDevice(node.device, perms);
       if (device) {
         // debug("device.type", device.type);
@@ -828,7 +832,7 @@ module.exports = function (RED) {
             };
             debug("_status Control %s -> %s", device.id, JSON.stringify(message));
             homebridge.HAPresourceByDeviceID(device.id, JSON.stringify(message), function (err, status) {
-              debug("status", err);
+              // debug("status", err);
               if (!err) {
                 debug("_status Controlled %s:%s ->", device.host, device.port);
                 node.status({
@@ -894,8 +898,8 @@ module.exports = function (RED) {
         callback(error);
       } // end of device if
     } catch (err) {
-      debug('_status', err);
-      error = "Homebridge not initialized";
+      // debug('_status', err);
+      error = "Homebridge not initialized -2";
       node.status({
         text: error,
         shape: 'ring',
@@ -915,11 +919,17 @@ module.exports = function (RED) {
    * @return {type}          description
    */
 
-  function _control(node, device, payload, callback) {
+  function _control(node, payload, callback) {
     try {
+      if (!hbDevices) {
+        throw new Error('hbDevices not initialized');
+      }
+      var device = hbDevices.findDevice(node.device, {
+        perms: 'pw'
+      });
       if (device) {
         var message;
-        console.log('device.type',device.type)
+        // console.log('device.type', device.type)
         switch (device.type) {
           case "00000110": // Camera RTPStream Management
           case "00000111": // Camera Control
@@ -931,10 +941,10 @@ module.exports = function (RED) {
             debug("Control %s ->", device.id, JSON.stringify(message));
             homebridge.HAPresourceByDeviceID(device.id, JSON.stringify(message), function (err, status) {
               if (!err) {
-              //  debug("Controlled %s ->", device.id, JSON.stringify(payload));
-              //  debug("Payload %s ->", device.id, status);
+                //  debug("Controlled %s ->", device.id, JSON.stringify(payload));
+                //  debug("Payload %s ->", device.id, status);
                 node.status({
-                  text: JSON.stringify(payload).slice(0, 40)+'...',
+                  text: JSON.stringify(payload).slice(0, 30) + '...',
                   shape: 'dot',
                   fill: 'green'
                 });
@@ -964,7 +974,7 @@ module.exports = function (RED) {
                   if (!err && status && status.characteristics[0].status === 0) {
                     debug("Controlled %s ->", device.id, JSON.stringify(status));
                     node.status({
-                      text: JSON.stringify(payload).slice(0, 40)+'...',
+                      text: JSON.stringify(payload).slice(0, 30) + '...',
                       shape: 'dot',
                       fill: 'green'
                     });
@@ -976,7 +986,7 @@ module.exports = function (RED) {
                   } else if (!err) {
                     debug("Controlled %s ->", device.id, payload);
                     node.status({
-                      text: JSON.stringify(payload).slice(0, 40)+'...',
+                      text: JSON.stringify(payload).slice(0, 30) + '...',
                       shape: 'dot',
                       fill: 'green'
                     });
@@ -1029,7 +1039,7 @@ module.exports = function (RED) {
         callback(error);
       }
     } catch (err) {
-      var error = "Homebridge not initialized";
+      var error = "Homebridge not initialized - 3 "+ err;
       node.status({
         text: error,
         shape: 'ring',