node-red-contrib-homebridge-automation 0.1.12-beta.28 → 0.1.12-beta.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-homebridge-automation",
-  "version": "0.1.12-beta.28",
+  "version": "0.1.12-beta.29",
   "description": "NodeRED Automation for HomeBridge",
   "main": "src/HAP-NodeRed.js",
   "scripts": {
@@ -48,7 +48,7 @@
   "dependencies": {
     "better-queue": ">=3.8.12",
     "debug": "^4.3.5",
-    "@homebridge/hap-client": "2.0.5-beta.2"
+    "@homebridge/hap-client": "2.0.5-beta.5"
   },
   "author": "NorthernMan54",
   "license": "ISC",

package/src/HapDeviceRoutes.js

@@ -1,16 +1,13 @@
-// HapDeviceRoutes.js
 const debug = require('debug')('hapNodeRed:HapDeviceRoutes');
 
 class HapDeviceRoutes {
   constructor(RED) {
     this.RED = RED;
-    this.hbDevices = false;  // remove this line
   }
 
   // POST /hap-device/refresh/:id
   refreshDevice(req, res) {
-    const id = req.params.id;
-    const conf = this.RED.nodes.getNode(id);
+    const conf = this.RED.nodes.getNode(req.params.id);
     if (conf) {
       res.status(200).send();
     } else {
@@ -20,103 +17,42 @@ class HapDeviceRoutes {
   }
 
   // GET /hap-device/evDevices/
-  getEvDevices(req, res) {
-    debug("evDevices", this.hbDevices.toList({ perms: 'ev' }).length);
-    if (this.hbDevices) {
-      res.send(this.hbDevices.toList({ perms: 'ev' }));
+  getDevices(req, res, perms) {
+    const devices = this.RED.nodes.getNode(req.params.id)?.evDevices;
+    if (devices && devices.length) {
+      res.send(devices);
     } else {
-      res.status(404).send();
+      res.status(404).send({ error: `No devices found for perms: ${perms}` });
     }
   }
 
   // GET /hap-device/evDevices/:id
-  getEvDeviceById(req, res) {
-    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();
-    }
-  }
-
-  // POST /hap-device/refresh/:id for hb-resume
-  refreshResumeDevice(req, res) {
-    const id = req.params.id;
-    const conf = this.RED.nodes.getNode(id);
-    if (conf) {
-      res.status(200).send();
-    } else {
-      debug("Can't refresh until deployed");
-      res.status(404).send();
-    }
-  }
-
-  // GET /hap-device/evDevices/ for hb-resume
-  getEvDevicesForResume(req, res) {
-    debug("evDevices", this.hbDevices.toList({ perms: 'ev' }).length);
-    if (this.hbDevices) {
-      res.send(this.hbDevices.toList({ perms: 'ev' }));
+  getDeviceById(req, res, key) {
+    const devices = this.RED.nodes.getNode(req.params.id)?.[key];
+    if (devices) {
+      debug(`${key} devices`, devices.length);
+      res.send(devices);
     } else {
       res.status(404).send();
     }
   }
 
-  // GET /hap-device/evDevices/:id for hb-resume
-  getEvDeviceByIdForResume(req, res) {
-    debug("evDevices", this.hbDevices.toList({ perms: 'ev' }).length);
-    if (this.hbDevices) {
-      res.send(this.hbDevices.toList({ perms: 'ev' }));
-    } else {
-      res.status(404).send();
-    }
-  }
-
-  // GET /hap-device/ctDevices/
-  getCtDevices(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();
-    }
-  }
-
-  // GET /hap-device/evDevices/:id
-  getCtDeviceById(req, res) {
-    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));
-    this.RED.httpAdmin.get('/hap-device/evDevices/', this.RED.auth.needsPermission('hb-event.read'), this.getEvDevices.bind(this));
-    this.RED.httpAdmin.get('/hap-device/evDevices/:id', this.RED.auth.needsPermission('hb-event.read'), this.getEvDeviceById.bind(this));
-    this.RED.httpAdmin.post('/hap-device/refresh/:id', this.RED.auth.needsPermission('hb-resume.read'), this.refreshResumeDevice.bind(this));
-    this.RED.httpAdmin.get('/hap-device/evDevices/', this.RED.auth.needsPermission('hb-resume.read'), this.getEvDevicesForResume.bind(this));
-    this.RED.httpAdmin.get('/hap-device/evDevices/:id', this.RED.auth.needsPermission('hb-resume.read'), this.getEvDeviceByIdForResume.bind(this));
-    this.RED.httpAdmin.get('/hap-device/ctDevices/', this.RED.auth.needsPermission('hb-control.read'), this.getCtDevices.bind(this));
-    this.RED.httpAdmin.get('/hap-device/ctDevices/:id', this.RED.auth.needsPermission('hb-control.read'), this.getCtDeviceById.bind(this));
+    const routes = [
+      { method: 'post', path: '/hap-device/refresh/:id', permission: 'hb-event.read', handler: this.refreshDevice },
+      { method: 'get', path: '/hap-device/evDevices/', permission: 'hb-event.read', handler: (req, res) => this.getDevices(req, res, 'ev') },
+      { method: 'get', path: '/hap-device/evDevices/:id', permission: 'hb-event.read', handler: (req, res) => this.getDeviceById(req, res, 'evDevices') },
+      { method: 'post', path: '/hap-device/refresh/:id', permission: 'hb-resume.read', handler: this.refreshDevice },
+      { method: 'get', path: '/hap-device/evDevices/', permission: 'hb-resume.read', handler: (req, res) => this.getDevices(req, res, 'ev') },
+      { method: 'get', path: '/hap-device/evDevices/:id', permission: 'hb-resume.read', handler: (req, res) => this.getDeviceById(req, res, 'evDevices') },
+      { method: 'get', path: '/hap-device/ctDevices/', permission: 'hb-control.read', handler: (req, res) => this.getDevices(req, res, 'pw') },
+      { method: 'get', path: '/hap-device/ctDevices/:id', permission: 'hb-control.read', handler: (req, res) => this.getDeviceById(req, res, 'ctDevices') },
+    ];
+
+    routes.forEach(({ method, path, permission, handler }) => {
+      this.RED.httpAdmin[method](path, this.RED.auth.needsPermission(permission), handler.bind(this));
+    });
   }
 }
 

package/src/hbBaseNode.js

@@ -58,6 +58,9 @@ class HbBaseNode {
     done();
   }
 
+  statusText(message) {
+    return message.slice(0, 20)
+  }
   /**
    * 
    * @param {*} warning - Message to log and display in debug panel
@@ -66,7 +69,7 @@ class HbBaseNode {
   handleError(warning, statusText) {
     this.warn(warning);
     this.status({
-      text: (statusText ? statusText : warning),
+      text: (statusText ? statusText : warning).slice(0, 20),
       shape: 'ring',
       fill: 'red',
     });

package/src/hbConfigNode.js

@@ -58,6 +58,7 @@ class HBConfigNode {
     this.hbDevices = await this.hapClient.getAllServices();
     this.evDevices = this.toList({ perms: 'ev' });
     this.ctDevices = this.toList({ perms: 'pw' });
+    console.log('ctDevices', this.hbDevices.filter(service => service.type == 'CameraRTPStreamManagement' && service.serviceName == 'Driveway 8E52'));
     this.handleDuplicates(this.evDevices);
     debug('Queue', this.reqisterQueue.getStats());
     this.reqisterQueue.resume();
@@ -65,7 +66,7 @@ class HBConfigNode {
 
   toList(perms) {
     const supportedTypes = [
-      'Battery', 'Carbon Dioxide Sensor', 'Carbon Monoxide Sensor', 'Doorbell',
+      'Battery', 'Carbon Dioxide Sensor', 'Carbon Monoxide Sensor', 'Camera Rtp Stream Management', 'Doorbell',
       'Fan', 'Fanv2', 'Garage Door Opener', 'Humidity Sensor', 'Input Source',
       'Leak Sensor', 'Lightbulb', 'Lock Mechanism', 'Motion Sensor', 'Occupancy Sensor',
       'Outlet', 'Smoke Sensor', 'Speaker', 'Stateless Programmable Switch', 'Switch',

package/src/hbControlNode.js

@@ -12,7 +12,13 @@ class HbControlNode extends hbBaseNode {
       this.handleError('HB not initialized');
       return;
     }
-
+    if (this.hbDevice.type == 'CameraRTPStreamManagement') {
+      message.payload = {
+        "resource-type": "image",
+        "image-width": 1920,
+        "image-height": 1080
+      };
+    }
     if (typeof message.payload !== 'object') {
       const validNames = Object.keys(this.hbDevice.values)
         .filter(key => key !== 'ConfiguredName')
@@ -25,24 +31,48 @@ class HbControlNode extends hbBaseNode {
     const results = [];
     let fill = 'green';
 
-    for (const key of Object.keys(message.payload)) {
+    if (this.hbDevice.type == 'CameraRTPStreamManagement') {
+      const result = await this.hbDevice.getResource({
+        "resource-type": "image",
+        "image-width": 1920,
+        "image-height": 1080
+      });
+      message = { ...message, ...this.createMessage(this.hbDevice) };
+      message.payload = result;
+      send(message);
+      results.push({ 'Received': result.length })
+    } else {
+      for (const key of Object.keys(message.payload)) {
 
-      try {
-        const result = await this.hbDevice.setCharacteristicByType(key, message.payload[key]);
-        results.push({ [result.type]: result.value });
-      } catch (error) {
-        this.error(`Failed to set value for ${key}: ${error.message}`);
-        results.push({ key: key + ' ' + error.message })
-        fill = 'red';
+        try {
+          const result = await this.hbDevice.setCharacteristicByType(key, message.payload[key]);
+          results.push({ [result.type]: result.value });
+        } catch (error) {
+          this.error(`Failed to set value for ${key}: ${error.message}`);
+          results.push({ key: key + ' ' + error.message })
+          fill = 'red';
+        }
       }
     }
 
     this.status({
-      text: JSON.stringify(Object.assign({}, ...results)),
+      text: this.statusText(JSON.stringify(Object.assign({}, ...results))),
       shape: 'dot',
       fill,
     });
   }
 }
 
+function btoa(str) {
+  var buffer;
+
+  if (str instanceof Buffer) {
+    buffer = str;
+  } else {
+    buffer = Buffer.from(str.toString(), 'binary');
+  }
+
+  return buffer.toString('base64');
+}
+
 module.exports = HbControlNode;

package/src/hbEventNode.js

@@ -11,7 +11,7 @@ class HbEventNode extends hbBaseNode {
     debug('handleHbReady', this.id, this.name, service.values)
     if (this.sendInitialState) {
       this.status({
-        text: JSON.stringify(service.values),
+        text: this.statusText(JSON.stringify(service.values)),
         shape: 'dot',
         fill: 'green',
       });

package/src/hbResumeNode.js

@@ -40,7 +40,7 @@ class HbResumeNode extends HbBaseNode {
     }
 
     this.status({
-      text: JSON.stringify(message.payload),
+      text: this.statusText(JSON.stringify(message.payload)),
       shape: 'dot',
       fill: 'green',
     });

package/src/hbStatusNode.js

@@ -16,7 +16,7 @@ class HbStatusNode extends HbBaseNode {
 
     const result = await this.hbDevice.refreshCharacteristics();
     this.status({
-      text: JSON.stringify(await this.hbDevice.values),
+      text: this.statusText(JSON.stringify(await this.hbDevice.values)),
       shape: 'dot',
       fill: 'green'
     });

package/test/node-red/flows.json

@@ -431,5 +431,177 @@
         "x": 800,
         "y": 300,
         "wires": []
+    },
+    {
+        "id": "12ce98441601c981",
+        "type": "hb-event",
+        "z": "caef1e7b5b399e80",
+        "name": "Driveway 8E52",
+        "Homebridge": "ECI-T24F2",
+        "Manufacturer": "HikVision",
+        "Service": "CameraRTPStreamManagement",
+        "device": "ECI-T24F2CB:6F:94:DD:43:77HikVisionDriveway 8E5200000110",
+        "conf": "557aec8e8c47e61e",
+        "sendInitialState": true,
+        "x": 340,
+        "y": 520,
+        "wires": [
+            [
+                "e2919464e7c4ab5c",
+                "08bc0ab3e3f2439f"
+            ]
+        ]
+    },
+    {
+        "id": "6216377792cba653",
+        "type": "hb-control",
+        "z": "caef1e7b5b399e80",
+        "name": "Driveway 8E52",
+        "Homebridge": "ECI-T24F2",
+        "Manufacturer": "HikVision",
+        "Service": "CameraRTPStreamManagement",
+        "device": "ECI-T24F2CB:6F:94:DD:43:77HikVisionDriveway 8E5200000110",
+        "conf": "557aec8e8c47e61e",
+        "outputs": 1,
+        "x": 940,
+        "y": 500,
+        "wires": [
+            [
+                "9dc75e95be7ba465",
+                "12d2a40f6441c49c"
+            ]
+        ]
+    },
+    {
+        "id": "08bc0ab3e3f2439f",
+        "type": "debug",
+        "z": "caef1e7b5b399e80",
+        "name": "debug 5",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": true,
+        "complete": "true",
+        "targetType": "full",
+        "statusVal": "payload",
+        "statusType": "auto",
+        "x": 600,
+        "y": 580,
+        "wires": []
+    },
+    {
+        "id": "e2919464e7c4ab5c",
+        "type": "switch",
+        "z": "caef1e7b5b399e80",
+        "name": "",
+        "property": "payload.MotionDetected",
+        "propertyType": "msg",
+        "rules": [
+            {
+                "t": "eq",
+                "v": "1",
+                "vt": "num"
+            }
+        ],
+        "checkall": "true",
+        "repair": false,
+        "outputs": 1,
+        "x": 590,
+        "y": 500,
+        "wires": [
+            [
+                "4982be53458df3a8"
+            ]
+        ]
+    },
+    {
+        "id": "4982be53458df3a8",
+        "type": "change",
+        "z": "caef1e7b5b399e80",
+        "name": "",
+        "rules": [
+            {
+                "t": "set",
+                "p": "payload",
+                "pt": "msg",
+                "to": "",
+                "tot": "date"
+            }
+        ],
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 740,
+        "y": 500,
+        "wires": [
+            [
+                "6216377792cba653"
+            ]
+        ]
+    },
+    {
+        "id": "9dc75e95be7ba465",
+        "type": "debug",
+        "z": "caef1e7b5b399e80",
+        "name": "debug 6",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": true,
+        "complete": "true",
+        "targetType": "full",
+        "statusVal": "payload",
+        "statusType": "msg",
+        "x": 1120,
+        "y": 500,
+        "wires": []
+    },
+    {
+        "id": "25a7fbf22f944415",
+        "type": "inject",
+        "z": "caef1e7b5b399e80",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{ \"MotionDetected\": 1 }",
+        "payloadType": "json",
+        "x": 340,
+        "y": 460,
+        "wires": [
+            [
+                "e2919464e7c4ab5c"
+            ]
+        ]
+    },
+    {
+        "id": "12d2a40f6441c49c",
+        "type": "file",
+        "z": "caef1e7b5b399e80",
+        "name": "",
+        "filename": "/Users/sgracey/Desktop/image.jpeg",
+        "filenameType": "str",
+        "appendNewline": false,
+        "createDir": false,
+        "overwriteFile": "true",
+        "encoding": "none",
+        "x": 1210,
+        "y": 620,
+        "wires": [
+            []
+        ]
     }
 ]