node-red-contrib-homebridge-automation 0.2.1-beta.4 → 0.2.1-beta.6

package/package.json

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

package/src/hbEventNode.js

@@ -27,7 +27,7 @@ class HbEventNode extends hbBaseNode {
       shape: 'dot',
       fill: 'green',
     });
-    this.send({ payload: service.values });
+    this.send({ ...this.createMessage(service) });
   }
 }
 

package/test/node-red/flows.json

@@ -19,7 +19,7 @@
         "id": "75c3fcfcb21ddc3a",
         "type": "tab",
         "label": "Flow 3",
-        "disabled": false,
+        "disabled": true,
         "info": "",
         "env": []
     },
@@ -31,12 +31,51 @@
         "info": "",
         "env": []
     },
+    {
+        "id": "4138921fd7b9a926",
+        "type": "tab",
+        "label": "Flow 5",
+        "disabled": false,
+        "info": "",
+        "env": []
+    },
     {
         "id": "7e647d67.f33acc",
         "type": "hb-conf",
         "username": "031-45-154",
         "macAddress": ""
     },
+    {
+        "id": "df5dd49178c517fa",
+        "type": "mqtt-broker",
+        "name": "",
+        "broker": "mqtt.local",
+        "port": "1883",
+        "clientid": "",
+        "autoConnect": true,
+        "usetls": false,
+        "protocolVersion": "4",
+        "keepalive": "60",
+        "cleansession": true,
+        "autoUnsubscribe": true,
+        "birthTopic": "",
+        "birthQos": "0",
+        "birthRetain": "false",
+        "birthPayload": "",
+        "birthMsg": {},
+        "closeTopic": "",
+        "closeQos": "0",
+        "closeRetain": "false",
+        "closePayload": "",
+        "closeMsg": {},
+        "willTopic": "",
+        "willQos": "0",
+        "willRetain": "false",
+        "willPayload": "",
+        "willMsg": {},
+        "userProps": "",
+        "sessionExpiry": ""
+    },
     {
         "id": "902c5887b6877df6",
         "type": "debug",
@@ -677,9 +716,7 @@
         "x": 360,
         "y": 800,
         "wires": [
-            [
-                "c68bef6563c5d07e"
-            ]
+            []
         ]
     },
     {
@@ -740,7 +777,7 @@
         "type": "debug",
         "z": "caef1e7b5b399e80",
         "name": "Status",
-        "active": true,
+        "active": false,
         "tosidebar": true,
         "console": false,
         "tostatus": true,
@@ -772,7 +809,7 @@
         "type": "debug",
         "z": "caef1e7b5b399e80",
         "name": "Catch",
-        "active": true,
+        "active": false,
         "tosidebar": true,
         "console": false,
         "tostatus": true,
@@ -2449,5 +2486,160 @@
                 "e7671cdf7ca08bdb"
             ]
         ]
+    },
+    {
+        "id": "5a0779448d4dcdb3",
+        "type": "mqtt in",
+        "z": "4138921fd7b9a926",
+        "name": "",
+        "topic": "home/#",
+        "qos": "2",
+        "datatype": "auto-detect",
+        "broker": "df5dd49178c517fa",
+        "nl": false,
+        "rap": true,
+        "rh": 0,
+        "inputs": 0,
+        "x": 130,
+        "y": 180,
+        "wires": [
+            [
+                "4510eba830da4c9d"
+            ]
+        ]
+    },
+    {
+        "id": "d82488396ae950bf",
+        "type": "debug",
+        "z": "4138921fd7b9a926",
+        "name": "debug 17",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": true,
+        "complete": "payload",
+        "targetType": "msg",
+        "statusVal": "device",
+        "statusType": "msg",
+        "x": 720,
+        "y": 140,
+        "wires": []
+    },
+    {
+        "id": "6f6d507ccce7460f",
+        "type": "switch",
+        "z": "4138921fd7b9a926",
+        "name": "",
+        "property": "shortTopic",
+        "propertyType": "msg",
+        "rules": [
+            {
+                "t": "eq",
+                "v": "SYStoMQTT",
+                "vt": "str"
+            },
+            {
+                "t": "eq",
+                "v": "version",
+                "vt": "str"
+            },
+            {
+                "t": "eq",
+                "v": "LWT",
+                "vt": "str"
+            },
+            {
+                "t": "else"
+            }
+        ],
+        "checkall": "false",
+        "repair": false,
+        "outputs": 4,
+        "x": 530,
+        "y": 180,
+        "wires": [
+            [
+                "d82488396ae950bf"
+            ],
+            [],
+            [
+                "1649c3dc535b26f2"
+            ],
+            [
+                "d7a34617ef5e9f31"
+            ]
+        ]
+    },
+    {
+        "id": "45cb1d621afc9b52",
+        "type": "debug",
+        "z": "4138921fd7b9a926",
+        "name": "debug 18",
+        "active": false,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": true,
+        "complete": "true",
+        "targetType": "full",
+        "statusVal": "topic",
+        "statusType": "auto",
+        "x": 320,
+        "y": 360,
+        "wires": []
+    },
+    {
+        "id": "4510eba830da4c9d",
+        "type": "function",
+        "z": "4138921fd7b9a926",
+        "name": "function 3",
+        "func": "const [home, device, shortTopic] = msg.topic.split(\"/\");\nmsg.shortTopic = shortTopic;\nmsg.device = device;\nreturn msg;",
+        "outputs": 1,
+        "timeout": 0,
+        "noerr": 0,
+        "initialize": "",
+        "finalize": "",
+        "libs": [],
+        "x": 320,
+        "y": 180,
+        "wires": [
+            [
+                "6f6d507ccce7460f",
+                "45cb1d621afc9b52"
+            ]
+        ]
+    },
+    {
+        "id": "d7a34617ef5e9f31",
+        "type": "debug",
+        "z": "4138921fd7b9a926",
+        "name": "debug 19",
+        "active": false,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": true,
+        "complete": "payload",
+        "targetType": "msg",
+        "statusVal": "shortTopic",
+        "statusType": "msg",
+        "x": 720,
+        "y": 260,
+        "wires": []
+    },
+    {
+        "id": "1649c3dc535b26f2",
+        "type": "debug",
+        "z": "4138921fd7b9a926",
+        "name": "debug 20",
+        "active": false,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": true,
+        "complete": "payload",
+        "targetType": "msg",
+        "statusVal": "device",
+        "statusType": "msg",
+        "x": 720,
+        "y": 200,
+        "wires": []
     }
 ]

package/test/node-red/flows_cred.json

@@ -0,0 +1,3 @@
+{
+    "$": "4608d6ceb4b69637921bb4f59e20a4684/mH88CDr3gPDxF4Iyp9VGhCXgzwGz8="
+}