node-red-contrib-homebridge-automation 0.3.0-beta.14 → 0.3.0-beta.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-homebridge-automation",
-  "version": "0.3.0-beta.14",
+  "version": "0.3.0-beta.15",
   "description": "NodeRED Automation for HomeBridge",
   "main": "src/HAP-NodeRed.js",
   "scripts": {
@@ -41,8 +41,8 @@
   },
   "dependencies": {
     "better-queue": ">=3.8.12",
-    "debug": "^4.3.7",
-    "@homebridge/hap-client": "^2.1.0"
+    "debug": "^4.4.1",
+    "@homebridge/hap-client": "^3.1.1"
   },
   "author": "NorthernMan54",
   "license": "ISC",

package/src/hbConfigNode.js

@@ -174,8 +174,11 @@ class HBConfigNode {
       this.monitor = await this.hapClient.monitorCharacteristics(monitorNodes);
       this.monitor.on('service-update', (services) => {
         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)}`
+          const eventNodes = Object.values(this.clientNodes).filter(clientNode => {
+            const deviceIdentifier = `${service.instance.name}${service.instance.username}${service.accessoryInformation.Manufacturer}${(service.accessoryInformation.Name ? service.accessoryInformation.Name : service.serviceName)}${service.uuid.slice(0, 8)}`;
+            // debug('service-update: compare', clientNode.config.device, deviceIdentifier);
+            return clientNode.config.device === deviceIdentifier;
+          }
           );
           // debug('service-update', service.serviceName, eventNodes);
           eventNodes.forEach(eventNode => eventNode.emit('hbEvent', service));

package/test/node-red/flows.json

@@ -35,7 +35,7 @@
         "id": "4138921fd7b9a926",
         "type": "tab",
         "label": "Flow 5",
-        "disabled": false,
+        "disabled": true,
         "info": "",
         "env": []
     },
@@ -43,7 +43,7 @@
         "id": "92f59d974b9c8a86",
         "type": "tab",
         "label": "Camera Test",
-        "disabled": true,
+        "disabled": false,
         "info": "",
         "env": []
     },
@@ -2883,14 +2883,14 @@
         "id": "6df154716efd4949",
         "type": "hb-event",
         "z": "92f59d974b9c8a86",
-        "name": "Side door",
-        "Homebridge": "homebridge",
-        "Manufacturer": "Eufy",
+        "name": "North Sidewalk 6EED",
+        "Homebridge": "ECI-T24F2",
+        "Manufacturer": "HikVision",
         "Service": "MotionSensor",
-        "device": "homebridge0E:89:A7:DA:D3:21EufySide door00000085",
+        "device": "ECI-T24F28E:88:AB:7A:D0:54HikVisionNorth Sidewalk 6EED00000085",
         "conf": "7e647d67.f33acc",
         "sendInitialState": true,
-        "x": 100,
+        "x": 140,
         "y": 220,
         "wires": [
             [
@@ -2916,7 +2916,7 @@
         "checkall": "true",
         "repair": false,
         "outputs": 1,
-        "x": 270,
+        "x": 370,
         "y": 220,
         "wires": [
             [
@@ -2943,7 +2943,7 @@
         "from": "",
         "to": "",
         "reg": false,
-        "x": 460,
+        "x": 540,
         "y": 220,
         "wires": [
             [
@@ -2955,14 +2955,14 @@
         "id": "769d2de2c6bd3544",
         "type": "hb-control",
         "z": "92f59d974b9c8a86",
-        "name": "Side door",
-        "Homebridge": "homebridge",
-        "Manufacturer": "Eufy",
+        "name": "North Sidewalk 6EED",
+        "Homebridge": "ECI-T24F2",
+        "Manufacturer": "HikVision",
         "Service": "CameraRTPStreamManagement",
-        "device": "homebridge0E:89:A7:DA:D3:21EufySide door00000110",
+        "device": "ECI-T24F28E:88:AB:7A:D0:54HikVisionNorth Sidewalk 6EED00000110",
         "conf": "7e647d67.f33acc",
         "outputs": 1,
-        "x": 660,
+        "x": 760,
         "y": 220,
         "wires": [
             [
@@ -2977,13 +2977,13 @@
         "name": "debug 21",
         "active": true,
         "tosidebar": true,
-        "console": false,
+        "console": true,
         "tostatus": true,
         "complete": "payload",
         "targetType": "msg",
         "statusVal": "payload",
         "statusType": "auto",
-        "x": 840,
+        "x": 850,
         "y": 280,
         "wires": []
     },
@@ -3024,7 +3024,7 @@
         "checkall": "true",
         "repair": false,
         "outputs": 1,
-        "x": 270,
+        "x": 330,
         "y": 340,
         "wires": [
             [
@@ -3051,7 +3051,7 @@
         "from": "",
         "to": "",
         "reg": false,
-        "x": 460,
+        "x": 540,
         "y": 340,
         "wires": [
             [
@@ -3070,7 +3070,7 @@
         "device": "ECI-T24F2CB:6F:94:DD:43:77HikVisionDriveway 8E5200000110",
         "conf": "7e647d67.f33acc",
         "outputs": 1,
-        "x": 680,
+        "x": 740,
         "y": 340,
         "wires": [
             [
@@ -3114,13 +3114,13 @@
         "name": "debug 22",
         "active": true,
         "tosidebar": true,
-        "console": false,
+        "console": true,
         "tostatus": true,
         "complete": "payload",
         "targetType": "msg",
         "statusVal": "payload",
         "statusType": "auto",
-        "x": 700,
+        "x": 710,
         "y": 500,
         "wires": []
     },
@@ -3152,5 +3152,115 @@
                 "d376945f7d6314f9"
             ]
         ]
+    },
+    {
+        "id": "448a23fd99b4e52a",
+        "type": "hb-event",
+        "z": "92f59d974b9c8a86",
+        "name": "Side door",
+        "Homebridge": "homebridge",
+        "Manufacturer": "Eufy",
+        "Service": "MotionSensor",
+        "device": "homebridge0E:89:A7:DA:D3:21EufySide door00000085",
+        "conf": "7e647d67.f33acc",
+        "sendInitialState": true,
+        "x": 100,
+        "y": 420,
+        "wires": [
+            [
+                "943911317b27b4bc",
+                "5b0570544efae122"
+            ]
+        ]
+    },
+    {
+        "id": "5b0570544efae122",
+        "type": "switch",
+        "z": "92f59d974b9c8a86",
+        "name": "",
+        "property": "payload.MotionDetected",
+        "propertyType": "msg",
+        "rules": [
+            {
+                "t": "eq",
+                "v": "1",
+                "vt": "num"
+            }
+        ],
+        "checkall": "true",
+        "repair": false,
+        "outputs": 1,
+        "x": 330,
+        "y": 420,
+        "wires": [
+            [
+                "7840c24c88d831cc"
+            ]
+        ]
+    },
+    {
+        "id": "7840c24c88d831cc",
+        "type": "change",
+        "z": "92f59d974b9c8a86",
+        "name": "",
+        "rules": [
+            {
+                "t": "set",
+                "p": "payload",
+                "pt": "msg",
+                "to": "",
+                "tot": "date"
+            }
+        ],
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 540,
+        "y": 420,
+        "wires": [
+            [
+                "389516e4379cfcc8"
+            ]
+        ]
+    },
+    {
+        "id": "389516e4379cfcc8",
+        "type": "hb-control",
+        "z": "92f59d974b9c8a86",
+        "name": "Side door",
+        "Homebridge": "homebridge",
+        "Manufacturer": "Eufy",
+        "Service": "CameraRTPStreamManagement",
+        "device": "homebridge0E:89:A7:DA:D3:21EufySide door00000110",
+        "conf": "7e647d67.f33acc",
+        "outputs": 1,
+        "x": 720,
+        "y": 420,
+        "wires": [
+            [
+                "1c18c4d5c4cd94db"
+            ]
+        ]
+    },
+    {
+        "id": "2802a70d3cd5570b",
+        "type": "hb-event",
+        "z": "92f59d974b9c8a86",
+        "name": "Canoe 5036",
+        "Homebridge": "ECI-T24F2",
+        "Manufacturer": "HikVision",
+        "Service": "MotionSensor",
+        "device": "ECI-T24F25C:EE:FE:4D:64:B4HikVisionCanoe 503600000085",
+        "conf": "7e647d67.f33acc",
+        "sendInitialState": true,
+        "x": 130,
+        "y": 600,
+        "wires": [
+            [
+                "943911317b27b4bc"
+            ]
+        ]
     }
 ]