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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-homebridge-automation",
-  "version": "0.1.12-beta.24",
+  "version": "0.1.12-beta.26",
   "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,11 +24,11 @@ class HbBaseNode {
       this.on('input', this.handleInput.bind(this));
     }
     this.on('close', this.handleClose.bind(this));
-    this.on('event', this.handleHBEventMessage.bind(this));
+    this.on('hbEvent', this.handleHBEventMessage.bind(this));
   }
 
   handleHBEventMessage(service) {
-    debug('topic for', this.id, service.serviceName, service.values);
+    debug('hbEvent for', this.id, service.serviceName, service.values);
 
     this.status({
       text: JSON.stringify(service.values),
@@ -38,115 +38,133 @@ class HbBaseNode {
     this.send({ payload: service.values });
   }
 
-
-  registerNode() {
-    debug("Registering node:", this.fullName);
-    this.hbDevice = hbDevices.findDevice(this.device);
-
-    if (!this.hbDevice) {
-      this.error(`Device not found: ${this.device}`);
-    } else {
-      this.deviceType = this.hbDevice.deviceType;
-    }
+  createMessage(service) {
+    return {
+      name: this.name,
+      payload: service.values,
+      Homebridge: service.instance.name,
+      Manufacturer: service.accessoryInformation.Manufacturer,
+      Service: service.type,
+      _device: this.device,
+      _confId: this.confId,
+    };
   }
 
-  handleClose(callback) {
+  handleClose(removed, done) {
     debug('close', this.name);
-    callback();
+    done();
   }
 
-  _convertHBcharacteristicToNode(hbMessage, node) {
-    let payload = {};
-    if (!hbMessage.payload) {
-      const device = hbDevices.findDevice(node.device);
-      if (device) {
-        hbMessage.forEach(characteristic => {
-          const charKey = `${characteristic.aid}.${characteristic.iid}`;
-          if (device.characteristics[charKey]) {
-            payload[device.characteristics[charKey].characteristic] = characteristic.value;
-          }
-        });
+  /*
+    registerNode() {
+      debug("Registering node:", this.fullName);
+      this.hbDevice = hbDevices.findDevice(this.device);
+  
+      if (!this.hbDevice) {
+        this.error(`Device not found: ${this.device}`);
+      } else {
+        this.deviceType = this.hbDevice.deviceType;
       }
-    } else {
-      payload = hbMessage.payload;
     }
-    return payload;
-  }
-
-  _createControlMessage(payload, node, device) {
-    const response = [];
-    for (const key in payload) {
-      const characteristic = this._getKey(device.characteristics, key);
-      if (characteristic) {
-        response.push({
-          aid: device.aid,
-          iid: characteristic.iid,
-          value: payload[key],
-        });
+  
+    handleClose(callback) {
+      debug('close', this.name);
+      callback();
+    }
+  
+    _convertHBcharacteristicToNode(hbMessage, node) {
+      let payload = {};
+      if (!hbMessage.payload) {
+        const device = hbDevices.findDevice(node.device);
+        if (device) {
+          hbMessage.forEach(characteristic => {
+            const charKey = `${characteristic.aid}.${characteristic.iid}`;
+            if (device.characteristics[charKey]) {
+              payload[device.characteristics[charKey].characteristic] = characteristic.value;
+            }
+          });
+        }
       } else {
-        this.warn(`Invalid characteristic: '${key}'. Available: ${device.descriptions}`);
-        node.status({ text: `Invalid characteristic: ${key}`, shape: 'ring', fill: 'yellow' });
+        payload = hbMessage.payload;
       }
+      return payload;
     }
-    return { characteristics: response };
-  }
-
-  async _status(nrDevice, node, perms) {
-    try {
-      const device = hbDevices.findDevice(node.device, perms);
-      if (!device) throw new Error(`Device not found: ${nrDevice}`);
-
-      const message = device.type === "00000110" || device.type === "00000111"
-        ? { "resource-type": "image", "image-width": 1920, "image-height": 1080 }
-        : `?id=${device.getCharacteristics}`;
-
-      const status = device.type === "00000110" || device.type === "00000111"
-        ? await this.HAPresourceByDeviceIDAsync(device.id, JSON.stringify(message))
-        : await this.HAPstatusByDeviceIDAsync(device.id, message);
-
-      node.status({ text: 'Success', shape: 'dot', fill: 'green' });
-      return device.type === "00000110" || device.type === "00000111"
-        ? { characteristics: { payload: this.btoa(status) } }
-        : status;
-    } catch (err) {
-      debug("Error in _status:", err);
-      node.status({ text: 'Error retrieving status', shape: 'ring', fill: 'red' });
-      throw err;
+  
+    _createControlMessage(payload, node, device) {
+      const response = [];
+      for (const key in payload) {
+        const characteristic = this._getKey(device.characteristics, key);
+        if (characteristic) {
+          response.push({
+            aid: device.aid,
+            iid: characteristic.iid,
+            value: payload[key],
+          });
+        } else {
+          this.warn(`Invalid characteristic: '${key}'. Available: ${device.descriptions}`);
+          node.status({ text: `Invalid characteristic: ${key}`, shape: 'ring', fill: 'yellow' });
+        }
+      }
+      return { characteristics: response };
     }
-  }
-
-  async _register(node) {
-    try {
-      const device = hbDevices.findDevice(node.device, { perms: 'ev' });
-      if (device) {
-        const message = { characteristics: device.eventRegisters };
-        await hapEventByDeviceIDAsync(device.id, JSON.stringify(message));
+  
+    async _status(nrDevice, node, perms) {
+      try {
+        const device = hbDevices.findDevice(node.device, perms);
+        if (!device) throw new Error(`Device not found: ${nrDevice}`);
+  
+        const message = device.type === "00000110" || device.type === "00000111"
+          ? { "resource-type": "image", "image-width": 1920, "image-height": 1080 }
+          : `?id=${device.getCharacteristics}`;
+  
+        const status = device.type === "00000110" || device.type === "00000111"
+          ? await this.HAPresourceByDeviceIDAsync(device.id, JSON.stringify(message))
+          : await this.HAPstatusByDeviceIDAsync(device.id, message);
+  
+        node.status({ text: 'Success', shape: 'dot', fill: 'green' });
+        return device.type === "00000110" || device.type === "00000111"
+          ? { characteristics: { payload: this.btoa(status) } }
+          : status;
+      } catch (err) {
+        debug("Error in _status:", err);
+        node.status({ text: 'Error retrieving status', shape: 'ring', fill: 'red' });
+        throw err;
       }
-    } catch (err) {
-      debug("Error in _register:", err);
-      node.status({ text: 'Register error', shape: 'ring', fill: 'red' });
     }
-  }
-
-  _getKey(obj, value) {
-    return Object.values(obj).find(char => char.characteristic.toLowerCase() === value.toLowerCase()) || null;
-  }
-
-  btoa(str) {
-    return Buffer.from(str.toString(), 'binary').toString('base64');
-  }
-
-  async HAPresourceByDeviceIDAsync(deviceId, message) {
-    return new Promise((resolve, reject) => {
-      homebridge.HAPresourceByDeviceID(deviceId, message, (err, status) => err ? reject(err) : resolve(status));
-    });
-  }
-
-  async HAPstatusByDeviceIDAsync(deviceId, message) {
-    return new Promise((resolve, reject) => {
-      homebridge.HAPstatusByDeviceID(deviceId, message, (err, status) => err ? reject(err) : resolve(status));
-    });
-  }
+  
+    async _register(node) {
+      try {
+        const device = hbDevices.findDevice(node.device, { perms: 'ev' });
+        if (device) {
+          const message = { characteristics: device.eventRegisters };
+          await hapEventByDeviceIDAsync(device.id, JSON.stringify(message));
+        }
+      } catch (err) {
+        debug("Error in _register:", err);
+        node.status({ text: 'Register error', shape: 'ring', fill: 'red' });
+      }
+    }
+  
+    _getKey(obj, value) {
+      return Object.values(obj).find(char => char.characteristic.toLowerCase() === value.toLowerCase()) || null;
+    }
+  
+    btoa(str) {
+      return Buffer.from(str.toString(), 'binary').toString('base64');
+    }
+  
+    async HAPresourceByDeviceIDAsync(deviceId, message) {
+      return new Promise((resolve, reject) => {
+        homebridge.HAPresourceByDeviceID(deviceId, message, (err, status) => err ? reject(err) : resolve(status));
+      });
+    }
+  
+    async HAPstatusByDeviceIDAsync(deviceId, message) {
+      return new Promise((resolve, reject) => {
+        homebridge.HAPstatusByDeviceID(deviceId, message, (err, status) => err ? reject(err) : resolve(status));
+      });
+    }
+    */
 }
 
 module.exports = HbBaseNode;

package/src/hbConfigNode.js

@@ -117,7 +117,10 @@ class HBConfigNode {
       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;
       });
 
@@ -141,7 +144,7 @@ class HBConfigNode {
 
           eventNodes.forEach((eventNode) => {
             if (eventNode._events && typeof eventNode.emit === 'function') {
-              eventNode.emit('event', service);
+              eventNode.emit('hbEvent', service);
             }
           });
         }
@@ -149,17 +152,18 @@ class HBConfigNode {
     }
     cb(null);
   }
-
-  deregister(clientNode) {
-    clientNode.status({ text: 'disconnected', shape: 'ring', fill: 'red' });
-    delete this.clientNodes[clientNode.id];
-  }
-
+  /*
+    deregister(clientNode) {
+      clientNode.status({ text: 'disconnected', shape: 'ring', fill: 'red' });
+      delete this.clientNodes[clientNode.id];
+    }
+  */
   close() {
     if (this.hapClient) {
       this.hapClient.destroy();
     }
   }
+
 }
 
 module.exports = HBConfigNode;

package/src/hbEventNode.js

@@ -3,87 +3,22 @@ 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' });
+  handleHbReady(service) {
+    debug('handleHbReady', this.id, this.name, service.values)
+    if (this.sendInitialState) {
+      this.status({
+        text: JSON.stringify(service.values),
+        shape: 'dot',
+        fill: 'green',
+      });
+      this.send({ ...this.createMessage(service) });
     }
   }
-
-  // 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);
-      }
-    });
-  }
-
-  // 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

@@ -22,8 +22,7 @@ class HbStatusNode extends HbBaseNode {
       fill: 'green'
     });
 
-    message.payload = result.values;
-    send(message);
+    send(Object.assign(message, this.createMessage(result)));
   }
 }
 

package/test/node-red/flows.json

@@ -22,8 +22,8 @@
         "tosidebar": true,
         "console": false,
         "tostatus": true,
-        "complete": "payload",
-        "targetType": "msg",
+        "complete": "true",
+        "targetType": "full",
         "statusVal": "payload",
         "statusType": "auto",
         "x": 800,
@@ -39,8 +39,8 @@
         "tosidebar": true,
         "console": false,
         "tostatus": true,
-        "complete": "payload",
-        "targetType": "msg",
+        "complete": "true",
+        "targetType": "full",
         "statusVal": "payload",
         "statusType": "auto",
         "x": 800,
@@ -72,8 +72,7 @@
         "y": 140,
         "wires": [
             [
-                "3d7babac3a298e60",
-                "452e3e6171aa7a25"
+                "3d7babac3a298e60"
             ]
         ]
     },
@@ -95,48 +94,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 +140,7 @@
         "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom Fan00000040",
         "conf": "557aec8e8c47e61e",
         "outputs": 0,
-        "x": 510,
+        "x": 810,
         "y": 600,
         "wires": []
     },
@@ -223,8 +184,8 @@
         "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
         "conf": "557aec8e8c47e61e",
         "outputs": 0,
-        "x": 740,
-        "y": 660,
+        "x": 800,
+        "y": 680,
         "wires": []
     },
     {
@@ -401,5 +362,111 @@
                 "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"
+            ]
+        ]
+    },
+    {
+        "id": "56633636bd2e624c",
+        "type": "inject",
+        "z": "caef1e7b5b399e80",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "60",
+        "crontab": "",
+        "once": true,
+        "onceDelay": "60",
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 190,
+        "y": 280,
+        "wires": [
+            [
+                "452e3e6171aa7a25"
+            ]
+        ]
     }
 ]

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;