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

package/package.json

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

package/src/hbBaseNode.js

@@ -38,127 +38,133 @@ class HbBaseNode {
     this.send({ payload: service.values });
   }
 
-  createMessage(event, isInitialState = false) {
+  createMessage(service) {
     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,
+      name: this.name,
+      payload: service.values,
+      Homebridge: service.instance.name,
+      Manufacturer: service.accessoryInformation.Manufacturer,
+      Service: service.type,
+      _device: this.device,
+      _confId: this.confId,
     };
   }
 
-  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;
-    }
-  }
-
-  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

@@ -152,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

@@ -9,15 +9,16 @@ class HbEventNode extends hbBaseNode {
   }
 
   handleHbReady(service) {
-    this.status({
-      text: JSON.stringify(service.values),
-      shape: 'dot',
-      fill: 'green',
-    });
-    this.send({ payload: service.values });
+    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) });
+    }
   }
-  // Create a message payload for event or initial state
-
 }
 
 module.exports = HbEventNode;

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"
             ]
         ]
     },
@@ -440,5 +439,34 @@
                 "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"
+            ]
+        ]
     }
 ]