node-red-contrib-homebridge-automation 0.1.12-beta.31 → 0.1.12-beta.33

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "node-red-contrib-homebridge-automation",
-  "version": "0.1.12-beta.31",
+  "version": "0.1.12-beta.33",
   "description": "NodeRED Automation for HomeBridge",
   "main": "src/HAP-NodeRed.js",
   "scripts": {
-    "api": "documentation build HAP-NodeRed.js -f md --config docs/documentation.yml > docs/API.md",
     "document": "./gh-md-toc --insert --no-backup --hide-footer README.md",
     "watch": "nodemon",
     "coverage": "nyc npm t",
@@ -28,9 +27,8 @@
     "url": "git+https://github.com/NorthernMan54/node-red-contrib-homebridge-automation.git"
   },
   "devDependencies": {
-    "@types/node-red": "^0.20.7",
+    "@types/node-red": "^1.3.5",
     "@types/jest": "^29.5.12",
-    "documentation": "14.0.3",
     "@eslint/js": "^9.14.0",
     "eslint": "^8.57.1",
     "eslint-plugin-format": "^0.1.2",
@@ -42,13 +40,13 @@
     "nodemon": "^3.1.4",
     "nyc": "^17.0.0",
     "prettier": "^3.3.2",
-    "rimraf": "^5.0.7",
+    "rimraf": "^6.0.1",
     "semver": "^7.6.2"
   },
   "dependencies": {
     "better-queue": ">=3.8.12",
     "debug": "^4.3.5",
-    "@homebridge/hap-client": "2.0.5-beta.5"
+    "@homebridge/hap-client": "2.0.5-beta.12"
   },
   "author": "NorthernMan54",
   "license": "ISC",

package/src/HapDeviceRoutes.js

@@ -30,7 +30,7 @@ class HapDeviceRoutes {
   getDeviceById(req, res, key) {
     const devices = this.RED.nodes.getNode(req.params.id)?.[key];
     if (devices) {
-      debug(`${key} devices`, devices.length);
+      // debug(`${key} devices`, devices.length);
       res.send(devices);
     } else {
       res.status(404).send();

package/src/hbConfigNode.js

@@ -8,6 +8,7 @@ class HBConfigNode {
     if (!config.jest) {
       RED.nodes.createNode(this, config);
 
+      // Initialize properties
       this.username = config.username;
       this.macAddress = config.macAddress || '';
       this.users = {};
@@ -18,7 +19,9 @@ class HBConfigNode {
       this.clientNodes = [];
       this.monitorNodes = [];
       this.log = new Log(console, true);
+      this.discoveryTimeout = null;
 
+      // Initialize queue
       this.reqisterQueue = new Queue(this._register.bind(this), {
         concurrent: 1,
         autoResume: false,
@@ -29,39 +32,40 @@ class HBConfigNode {
       });
       this.reqisterQueue.pause();
 
+      // Initialize HAP client
       this.hapClient = new HapClient({
-        config: { debug: false },
+        config: { debug: true },
         pin: config.username,
         logger: this.log,
       });
 
-      this.waitForNoMoreDiscoveries();
       this.hapClient.on('instance-discovered', this.waitForNoMoreDiscoveries);
-
+      this.waitForNoMoreDiscoveries();
       this.on('close', this.close.bind(this));
     }
   }
 
   waitForNoMoreDiscoveries = () => {
-    if (this.discoveryTimeout) {
+    if (!this.discoveryTimeout) {
       clearTimeout(this.discoveryTimeout);
+      this.discoveryTimeout = setTimeout(() => {
+        this.log.debug('No more instances discovered, publishing services');
+        this.hapClient.removeListener('instance-discovered', this.waitForNoMoreDiscoveries);
+        this.hapClient.on('instance-discovered', async (instance) => { debug('instance-discovered', instance); await this.monitorDevices(); });
+        this.hapClient.on('discovery-ended', async () => { debug('discovery-ended'); });
+        this.handleReady();
+        this.discoveryTimeout = null;
+      }, 5000);
     }
-
-    this.discoveryTimeout = setTimeout(() => {
-      this.log.debug('No more instances discovered, publishing services');
-      this.hapClient.removeListener('instance-discovered', this.waitForNoMoreDiscoveries);
-      this.handleReady();
-    }, 5000);
   };
 
   async handleReady() {
     this.hbDevices = await this.hapClient.getAllServices();
     this.evDevices = this.toList({ perms: 'ev' });
     this.ctDevices = this.toList({ perms: 'pw' });
-    console.log('evDevices', this.evDevices);
-    console.log('ctDevices', this.ctDevices);
+    this.log.info(`Devices initialized: evDevices: ${this.evDevices.length}, ctDevices: ${this.ctDevices.length}`);
     this.handleDuplicates(this.evDevices);
-    debug('Queue', this.reqisterQueue.getStats());
+    debug('Queue stats:', this.reqisterQueue.getStats());
     this.reqisterQueue.resume();
   }
 
@@ -92,23 +96,19 @@ class HBConfigNode {
     const seenFullNames = new Set();
     const seenUniqueIds = new Set();
 
-    for (const endpoint of list) {
-      if (seenFullNames.has(endpoint.fullName)) {
+    list.forEach(endpoint => {
+      if (!seenFullNames.add(endpoint.fullName)) {
         console.warn('WARNING: Duplicate device name', endpoint.fullName);
-      } else {
-        seenFullNames.add(endpoint.fullName);
       }
 
-      if (seenUniqueIds.has(endpoint.uniqueId)) {
-        console.error('ERROR: Parsing failed, duplicate uniqueID.', endpoint.fullName);
-      } else {
-        seenUniqueIds.add(endpoint.uniqueId);
+      if (!seenUniqueIds.add(endpoint.uniqueId)) {
+        console.error('ERROR: Duplicate uniqueId detected.', endpoint.fullName);
       }
-    }
+    });
   }
 
   register(clientNode) {
-    debug('Register %s -> %s', clientNode.type, clientNode.name);
+    debug('Register: %s type: %s', clientNode.type, clientNode.name);
     this.clientNodes[clientNode.id] = clientNode;
     this.reqisterQueue.push(clientNode);
     clientNode.status({ fill: 'yellow', shape: 'ring', text: 'connecting' });
@@ -116,64 +116,62 @@ class HBConfigNode {
 
   async _register(clientNodes, cb) {
     for (const clientNode of clientNodes) {
-      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)}`;
-        if (clientNode.device === deviceUnique) {
-          clientNode.status({ fill: 'green', shape: 'dot', text: 'connected' });
-          clientNode.emit('hbReady', service);
+      debug('_Register: %s type: %s', clientNode.type, clientNode.name, clientNode.instance);
+      const matchedDevice = this.hbDevices.find(service =>
+        clientNode.device === `${service.instance.name}${service.instance.username}${service.accessoryInformation.Manufacturer}${service.serviceName}${service.uuid.slice(0, 8)}`
+      );
+
+      if (matchedDevice) {
+        clientNode.hbDevice = matchedDevice;
+        clientNode.status({ fill: 'green', shape: 'dot', text: 'connected' });
+        clientNode.emit('hbReady', matchedDevice);
+        debug('_Registered: %s type: %s', matchedDevice.type, matchedDevice.serviceName, matchedDevice.instance);
+        if (clientNode.config.type === 'hb-status' || clientNode.config.type === 'hb-event') {
+          this.monitorNodes[clientNode.device] = matchedDevice;
         }
-        return clientNode.device === deviceUnique;
-      });
-
-      if (clientNode.config.type === 'hb-status') {
-        this.monitorNodes[clientNode.device] = clientNode.hbDevice;
-      }
-
-      if (!clientNode.hbDevice) {
-        console.error('ERROR: _register - HB Device Missing', clientNode.name);
+      } else {
+        console.error('ERROR: Device registration failed', clientNode.name);
       }
     }
 
+    await this.monitorDevices();
+
+    cb(null);
+  }
+
+  async monitorDevices() {
+    debug('monitorDevices', Object.keys(this.monitorNodes).length);
     if (Object.keys(this.monitorNodes).length) {
       this.monitor = await this.hapClient.monitorCharacteristics(Object.values(this.monitorNodes));
       this.monitor.on('service-update', (services) => {
-        for (const service of services) {
-          const eventNodes = Object.values(this.clientNodes).filter(
-            clientNode =>
-              clientNode.config.device === `${service.instance.name}${service.instance.username}${service.accessoryInformation.Manufacturer}${service.serviceName}${service.uuid.slice(0, 8)}`
+        services.forEach(service => {
+          const eventNodes = Object.values(this.clientNodes).filter(clientNode =>
+            clientNode.config.device === `${service.instance.name}${service.instance.username}${service.accessoryInformation.Manufacturer}${service.serviceName}${service.uuid.slice(0, 8)}`
           );
-
-          eventNodes.forEach((eventNode) => {
-            if (eventNode._events && typeof eventNode.emit === 'function') {
-              eventNode.emit('hbEvent', service);
-            }
-          });
-        }
+          eventNodes.forEach(eventNode => eventNode.emit('hbEvent', service));
+        });
       });
+      this.monitor.on('monitor-close', (hadError) => {
+        debug('monitor-close', hadError)
+        if (!this.hapClient.this.discoveryInProgress) {
+          this.monitor.finish();
+          this.hapClient.resetInstancePool();
+        }
+      })
     }
-    cb(null);
   }
-  /*
-    deregister(clientNode) {
-      clientNode.status({ text: 'disconnected', shape: 'ring', fill: 'red' });
-      delete this.clientNodes[clientNode.id];
-    }
-  */
   close() {
-    if (this.hapClient) {
-      this.hapClient.destroy();
-    }
+    debug('hb-config: close');
+    this.hapClient?.destroy();
   }
-
 }
 
-// Cameras have multiple AID's of 1....
+
+// Filter unique devices by AID, service name, username, and port
 const filterUnique = (data) => {
   const seen = new Set();
   return data.filter(item => {
     const uniqueKey = `${item.aid}-${item.serviceName}-${item.instance.username}-${item.instance.port}`;
-    console.log(uniqueKey, seen.has(uniqueKey))
     if (seen.has(uniqueKey)) return false;
     seen.add(uniqueKey);
     return true;

package/src/hbControlNode.js

@@ -6,7 +6,7 @@ class HbControlNode extends hbBaseNode {
     super(config, RED);
   }
 
-  async handleInput(message, send) {
+  async handleInput(message, send, done) {
     debug('handleInput', message.payload, this.name);
 
     if (!this.hbDevice) {
@@ -54,6 +54,7 @@ class HbControlNode extends hbBaseNode {
             const result = await this.hbDevice.setCharacteristicByType(key, message.payload[key]);
             results.push({ [result.type]: result.value });
           } catch (error) {
+            console.log(error)
             this.error(`Failed to set value for "${key}": ${error.message}`);
             results.push({ [key]: `Error: ${error.message}` });
             fill = 'red';
@@ -64,15 +65,13 @@ class HbControlNode extends hbBaseNode {
       // Update status
       const statusText = this.statusText(JSON.stringify(Object.assign({}, ...results)));
       this.status({ text: statusText, shape: 'dot', fill });
+      done
     } catch (error) {
       this.error(`Unhandled error: ${error.message}`);
       this.status({ text: 'Unhandled error', shape: 'dot', fill: 'red' });
+      done(`Unhandled error: ${error.message}`);
     }
   }
 }
 
-function btoa(str) {
-  return Buffer.isBuffer(str) ? str.toString('base64') : Buffer.from(str.toString(), 'binary').toString('base64');
-}
-
 module.exports = HbControlNode;

package/src/hbStatusNode.js

@@ -6,7 +6,7 @@ class HbStatusNode extends HbBaseNode {
     super(config, RED);
   }
 
-  async handleInput(message, send) {
+  async handleInput(message, send, done) {
     debug('handleInput', message.payload, this.name);
 
     if (!this.hbDevice) {
@@ -15,13 +15,21 @@ class HbStatusNode extends HbBaseNode {
     }
 
     const result = await this.hbDevice.refreshCharacteristics();
-    this.status({
-      text: this.statusText(JSON.stringify(await this.hbDevice.values)),
-      shape: 'dot',
-      fill: 'green'
-    });
+    if (result) {
+      this.status({
+        text: this.statusText(JSON.stringify(await this.hbDevice.values)),
+        shape: 'dot',
+        fill: 'green'
+      });
+
+      send(Object.assign(message, this.createMessage(result)));
+      done
+    } else {
+      this.status({ fill: "red", shape: "ring", text: "disconnected" });
+      this.error("No response from device", this.name);
+      done("No response from device");
+    }
 
-    send(Object.assign(message, this.createMessage(result)));
   }
 }
 

package/test/node-red/.flows.json.backup

@@ -22,12 +22,12 @@
         "tosidebar": true,
         "console": false,
         "tostatus": true,
-        "complete": "payload",
-        "targetType": "msg",
+        "complete": "true",
+        "targetType": "full",
         "statusVal": "payload",
         "statusType": "auto",
-        "x": 800,
-        "y": 140,
+        "x": 820,
+        "y": 40,
         "wires": []
     },
     {
@@ -39,12 +39,12 @@
         "tosidebar": true,
         "console": false,
         "tostatus": true,
-        "complete": "payload",
-        "targetType": "msg",
+        "complete": "true",
+        "targetType": "full",
         "statusVal": "payload",
         "statusType": "auto",
-        "x": 800,
-        "y": 260,
+        "x": 820,
+        "y": 100,
         "wires": []
     },
     {
@@ -68,12 +68,11 @@
         "topic": "",
         "payload": "",
         "payloadType": "date",
-        "x": 250,
-        "y": 140,
+        "x": 270,
+        "y": 40,
         "wires": [
             [
-                "3d7babac3a298e60",
-                "452e3e6171aa7a25"
+                "3d7babac3a298e60"
             ]
         ]
     },
@@ -87,8 +86,8 @@
         "Service": "Lightbulb",
         "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
         "conf": "557aec8e8c47e61e",
-        "x": 480,
-        "y": 140,
+        "x": 500,
+        "y": 40,
         "wires": [
             [
                 "902c5887b6877df6"
@@ -96,27 +95,58 @@
         ]
     },
     {
-        "id": "696e04753d952daf",
-        "type": "hb-status",
+        "id": "452e3e6171aa7a25",
+        "type": "hb-resume",
         "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": 260,
+        "x": 500,
+        "y": 160,
         "wires": [
             [
-                "a866ae0bb24ce682"
+                "1093ab38b01fd39f"
             ]
         ]
     },
     {
-        "id": "bb88544904b343a1",
-        "type": "hb-event",
+        "id": "1093ab38b01fd39f",
+        "type": "debug",
+        "z": "caef1e7b5b399e80",
+        "name": "debug 3",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": true,
+        "complete": "payload",
+        "targetType": "msg",
+        "statusVal": "payload",
+        "statusType": "auto",
+        "x": 820,
+        "y": 160,
+        "wires": []
+    },
+    {
+        "id": "0ed3cd7e0d60beda",
+        "type": "hb-control",
+        "z": "caef1e7b5b399e80",
+        "name": "West Bedroom Fan",
+        "Homebridge": "homebridge",
+        "Manufacturer": "Tasmota",
+        "Service": "Fan",
+        "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom Fan00000040",
+        "conf": "557aec8e8c47e61e",
+        "outputs": 0,
+        "x": 510,
+        "y": 220,
+        "wires": []
+    },
+    {
+        "id": "6703815a8874b156",
+        "type": "hb-control",
         "z": "caef1e7b5b399e80",
         "name": "West Bedroom",
         "Homebridge": "homebridge",
@@ -124,16 +154,251 @@
         "Service": "Lightbulb",
         "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
         "conf": "557aec8e8c47e61e",
-        "sendInitialState": false,
-        "x": 220,
+        "outputs": 1,
+        "x": 500,
+        "y": 300,
+        "wires": [
+            [
+                "f194fc4bcb1997a9"
+            ]
+        ]
+    },
+    {
+        "id": "24660f9d2862cee9",
+        "type": "inject",
+        "z": "caef1e7b5b399e80",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"On\": true, \"RotationSpeed\": 33}",
+        "payloadType": "json",
+        "x": 90,
+        "y": 180,
+        "wires": [
+            [
+                "0ed3cd7e0d60beda"
+            ]
+        ]
+    },
+    {
+        "id": "8c0ecac45b01df73",
+        "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": 110,
+        "y": 240,
+        "wires": [
+            [
+                "0ed3cd7e0d60beda"
+            ]
+        ]
+    },
+    {
+        "id": "b14ebf264be0c60d",
+        "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": 110,
+        "y": 300,
+        "wires": [
+            [
+                "6703815a8874b156"
+            ]
+        ]
+    },
+    {
+        "id": "f872545e74246764",
+        "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": 110,
+        "y": 340,
+        "wires": [
+            [
+                "6703815a8874b156"
+            ]
+        ]
+    },
+    {
+        "id": "7eae7b87f319966e",
+        "type": "inject",
+        "z": "caef1e7b5b399e80",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 320,
+        "y": 260,
+        "wires": [
+            [
+                "6703815a8874b156",
+                "0ed3cd7e0d60beda"
+            ]
+        ]
+    },
+    {
+        "id": "6a7b40f6149f2d36",
+        "type": "inject",
+        "z": "caef1e7b5b399e80",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"Off\": false}",
+        "payloadType": "json",
+        "x": 110,
         "y": 380,
         "wires": [
-            []
+            [
+                "6703815a8874b156"
+            ]
         ]
     },
     {
-        "id": "452e3e6171aa7a25",
-        "type": "hb-resume",
+        "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": 110,
+        "y": 80,
+        "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": 110,
+        "y": 140,
+        "wires": [
+            [
+                "452e3e6171aa7a25"
+            ]
+        ]
+    },
+    {
+        "id": "82638dac6ac32bb1",
+        "type": "hb-event",
         "z": "caef1e7b5b399e80",
         "name": "West Bedroom",
         "Homebridge": "homebridge",
@@ -141,19 +406,20 @@
         "Service": "Lightbulb",
         "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
         "conf": "557aec8e8c47e61e",
-        "x": 480,
-        "y": 460,
+        "sendInitialState": true,
+        "x": 500,
+        "y": 100,
         "wires": [
             [
-                "1093ab38b01fd39f"
+                "a866ae0bb24ce682"
             ]
         ]
     },
     {
-        "id": "1093ab38b01fd39f",
+        "id": "f194fc4bcb1997a9",
         "type": "debug",
         "z": "caef1e7b5b399e80",
-        "name": "debug 3",
+        "name": "debug 4",
         "active": true,
         "tosidebar": true,
         "console": false,
@@ -163,26 +429,137 @@
         "statusVal": "payload",
         "statusType": "auto",
         "x": 800,
-        "y": 460,
+        "y": 300,
         "wires": []
     },
     {
-        "id": "0ed3cd7e0d60beda",
+        "id": "12ce98441601c981",
+        "type": "hb-event",
+        "z": "caef1e7b5b399e80",
+        "name": "Driveway",
+        "Homebridge": "ECI-T24F2",
+        "Manufacturer": "HikVision",
+        "Service": "MotionSensor",
+        "device": "ECI-T24F2CB:6F:94:DD:43:77HikVisionDriveway00000085",
+        "conf": "557aec8e8c47e61e",
+        "sendInitialState": true,
+        "x": 320,
+        "y": 520,
+        "wires": [
+            [
+                "e2919464e7c4ab5c",
+                "08bc0ab3e3f2439f"
+            ]
+        ]
+    },
+    {
+        "id": "6216377792cba653",
         "type": "hb-control",
         "z": "caef1e7b5b399e80",
-        "name": "West Bedroom",
-        "Homebridge": "homebridge",
-        "Manufacturer": "Tasmota",
-        "Service": "Lightbulb",
-        "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000043",
+        "name": "Driveway 8E52",
+        "Homebridge": "ECI-T24F2",
+        "Manufacturer": "HikVision",
+        "Service": "CameraRTPStreamManagement",
+        "device": "ECI-T24F2CB:6F:94:DD:43:77HikVisionDriveway 8E5200000110",
         "conf": "557aec8e8c47e61e",
-        "outputs": 0,
-        "x": 500,
-        "y": 600,
+        "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": "24660f9d2862cee9",
+        "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": "",
@@ -200,18 +577,89 @@
         "once": false,
         "onceDelay": 0.1,
         "topic": "",
-        "payload": "",
-        "payloadType": "date",
-        "x": 200,
-        "y": 600,
+        "payload": "{ \"MotionDetected\": 1 }",
+        "payloadType": "json",
+        "x": 340,
+        "y": 460,
         "wires": [
             [
-                "0ed3cd7e0d60beda"
+                "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": [
+            []
+        ]
+    },
+    {
+        "id": "4b787bfb023ccf23",
+        "type": "hb-event",
+        "z": "caef1e7b5b399e80",
+        "name": "Backyard",
+        "Homebridge": "Default Model",
+        "Manufacturer": "NRCHKB",
+        "Service": "TemperatureSensor",
+        "device": "Default Model69:62:B7:AE:38:D4NRCHKBBackyard0000008A",
+        "conf": "557aec8e8c47e61e",
+        "sendInitialState": true,
+        "x": 160,
+        "y": 660,
+        "wires": [
+            [
+                "c68bef6563c5d07e"
+            ]
+        ]
+    },
+    {
+        "id": "c68bef6563c5d07e",
+        "type": "debug",
+        "z": "caef1e7b5b399e80",
+        "name": "debug 7",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": true,
+        "complete": "payload",
+        "targetType": "msg",
+        "statusVal": "payload",
+        "statusType": "auto",
+        "x": 620,
+        "y": 740,
+        "wires": []
+    },
+    {
+        "id": "3c36252a6f45eed9",
+        "type": "hb-status",
+        "z": "caef1e7b5b399e80",
+        "name": "Backyard Tree",
+        "Homebridge": "Default Model",
+        "Manufacturer": "NRCHKB",
+        "Service": "TemperatureSensor",
+        "device": "Default Model69:62:B7:AE:38:D4NRCHKBBackyard Tree0000008A",
+        "conf": "557aec8e8c47e61e",
+        "x": 360,
+        "y": 800,
+        "wires": [
+            [
+                "c68bef6563c5d07e"
             ]
         ]
     },
     {
-        "id": "d9f8181e9e6b3cfd",
+        "id": "3b7537939b63eee8",
         "type": "inject",
         "z": "caef1e7b5b399e80",
         "name": "",
@@ -231,12 +679,85 @@
         "topic": "",
         "payload": "",
         "payloadType": "date",
-        "x": 210,
-        "y": 460,
+        "x": 150,
+        "y": 800,
         "wires": [
             [
-                "452e3e6171aa7a25"
+                "3c36252a6f45eed9"
+            ]
+        ]
+    },
+    {
+        "id": "aabce5ff7fbbeec6",
+        "type": "status",
+        "z": "caef1e7b5b399e80",
+        "name": "",
+        "scope": [
+            "3d7babac3a298e60",
+            "452e3e6171aa7a25",
+            "0ed3cd7e0d60beda",
+            "6703815a8874b156",
+            "82638dac6ac32bb1",
+            "6216377792cba653",
+            "12ce98441601c981",
+            "4b787bfb023ccf23",
+            "3c36252a6f45eed9"
+        ],
+        "x": 1020,
+        "y": 380,
+        "wires": [
+            [
+                "94f051597d18eaa3"
+            ]
+        ]
+    },
+    {
+        "id": "94f051597d18eaa3",
+        "type": "debug",
+        "z": "caef1e7b5b399e80",
+        "name": "Status",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": true,
+        "complete": "true",
+        "targetType": "full",
+        "statusVal": "status.source.name",
+        "statusType": "msg",
+        "x": 1190,
+        "y": 380,
+        "wires": []
+    },
+    {
+        "id": "296297c79b544f59",
+        "type": "catch",
+        "z": "caef1e7b5b399e80",
+        "name": "",
+        "scope": null,
+        "uncaught": false,
+        "x": 1020,
+        "y": 300,
+        "wires": [
+            [
+                "0073218b1ebc53f1"
             ]
         ]
+    },
+    {
+        "id": "0073218b1ebc53f1",
+        "type": "debug",
+        "z": "caef1e7b5b399e80",
+        "name": "Catch",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": true,
+        "complete": "true",
+        "targetType": "full",
+        "statusVal": "payload",
+        "statusType": "msg",
+        "x": 1190,
+        "y": 300,
+        "wires": []
     }
 ]

package/test/node-red/flows.json

@@ -243,7 +243,7 @@
         "payload": "{\"On\": true}",
         "payloadType": "json",
         "x": 110,
-        "y": 280,
+        "y": 300,
         "wires": [
             [
                 "6703815a8874b156"
@@ -436,14 +436,14 @@
         "id": "12ce98441601c981",
         "type": "hb-event",
         "z": "caef1e7b5b399e80",
-        "name": "Driveway 8E52",
+        "name": "Driveway",
         "Homebridge": "ECI-T24F2",
         "Manufacturer": "HikVision",
-        "Service": "CameraRTPStreamManagement",
-        "device": "ECI-T24F2CB:6F:94:DD:43:77HikVisionDriveway 8E5200000110",
+        "Service": "MotionSensor",
+        "device": "ECI-T24F2CB:6F:94:DD:43:77HikVisionDriveway00000085",
         "conf": "557aec8e8c47e61e",
         "sendInitialState": true,
-        "x": 340,
+        "x": 320,
         "y": 520,
         "wires": [
             [
@@ -603,5 +603,161 @@
         "wires": [
             []
         ]
+    },
+    {
+        "id": "4b787bfb023ccf23",
+        "type": "hb-event",
+        "z": "caef1e7b5b399e80",
+        "name": "Backyard",
+        "Homebridge": "Default Model",
+        "Manufacturer": "NRCHKB",
+        "Service": "TemperatureSensor",
+        "device": "Default Model69:62:B7:AE:38:D4NRCHKBBackyard0000008A",
+        "conf": "557aec8e8c47e61e",
+        "sendInitialState": true,
+        "x": 160,
+        "y": 660,
+        "wires": [
+            [
+                "c68bef6563c5d07e"
+            ]
+        ]
+    },
+    {
+        "id": "c68bef6563c5d07e",
+        "type": "debug",
+        "z": "caef1e7b5b399e80",
+        "name": "debug 7",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": true,
+        "complete": "payload",
+        "targetType": "msg",
+        "statusVal": "payload",
+        "statusType": "auto",
+        "x": 620,
+        "y": 740,
+        "wires": []
+    },
+    {
+        "id": "3c36252a6f45eed9",
+        "type": "hb-status",
+        "z": "caef1e7b5b399e80",
+        "name": "Backyard Tree",
+        "Homebridge": "Default Model",
+        "Manufacturer": "NRCHKB",
+        "Service": "TemperatureSensor",
+        "device": "Default Model69:62:B7:AE:38:D4NRCHKBBackyard Tree0000008A",
+        "conf": "557aec8e8c47e61e",
+        "x": 360,
+        "y": 800,
+        "wires": [
+            [
+                "c68bef6563c5d07e"
+            ]
+        ]
+    },
+    {
+        "id": "3b7537939b63eee8",
+        "type": "inject",
+        "z": "caef1e7b5b399e80",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "60",
+        "crontab": "",
+        "once": true,
+        "onceDelay": "60",
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 150,
+        "y": 800,
+        "wires": [
+            [
+                "3c36252a6f45eed9"
+            ]
+        ]
+    },
+    {
+        "id": "aabce5ff7fbbeec6",
+        "type": "status",
+        "z": "caef1e7b5b399e80",
+        "name": "",
+        "scope": [
+            "3d7babac3a298e60",
+            "452e3e6171aa7a25",
+            "0ed3cd7e0d60beda",
+            "6703815a8874b156",
+            "82638dac6ac32bb1",
+            "6216377792cba653",
+            "12ce98441601c981",
+            "4b787bfb023ccf23",
+            "3c36252a6f45eed9"
+        ],
+        "x": 1020,
+        "y": 380,
+        "wires": [
+            [
+                "94f051597d18eaa3"
+            ]
+        ]
+    },
+    {
+        "id": "94f051597d18eaa3",
+        "type": "debug",
+        "z": "caef1e7b5b399e80",
+        "name": "Status",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": true,
+        "complete": "true",
+        "targetType": "full",
+        "statusVal": "status.source.name",
+        "statusType": "msg",
+        "x": 1190,
+        "y": 380,
+        "wires": []
+    },
+    {
+        "id": "296297c79b544f59",
+        "type": "catch",
+        "z": "caef1e7b5b399e80",
+        "name": "",
+        "scope": null,
+        "uncaught": false,
+        "x": 1020,
+        "y": 300,
+        "wires": [
+            [
+                "0073218b1ebc53f1"
+            ]
+        ]
+    },
+    {
+        "id": "0073218b1ebc53f1",
+        "type": "debug",
+        "z": "caef1e7b5b399e80",
+        "name": "Catch",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": true,
+        "complete": "true",
+        "targetType": "full",
+        "statusVal": "payload",
+        "statusType": "msg",
+        "x": 1190,
+        "y": 280,
+        "wires": []
     }
 ]