node-red-contrib-homebridge-automation 0.3.0-beta.9 → 0.3.1-beta.0

package/.github/dependabot.yml

@@ -11,3 +11,17 @@ updates:
     versions:
     - 13.2.0
     - 13.2.1
+  groups:
+    npm-dependencies:
+      patterns:
+        - "*"
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "10:00"
+  open-pull-requests-limit: 10
+  groups:
+    github-actions:
+      patterns:
+        - "*"

package/.github/workflows/Build and Publish.yml

@@ -1,43 +1,47 @@
-name:
-  'Build, Publish and Release'
-
-  #
-  # Automatically publish beta releases on pushes, require a manual workflow action for production releases
-  #
-  # Does the following
-  # 1 - Run the documentation script against the package
-  # 2 - Create the npm package using the package.json version tag ( or for beta releases, adds a beta tag and increments as needed )
-  # 3 - Publish the npm package
-  # 4 - For releases against the latest branch, create a github release as well
+name: "Build, Publish and Release"
+
+ 
+ #
+ # Automatically publish beta releases on pushes, require a manual workflow action for production releases
+ #
+ # Does the following
+ # 1 - Run the documentation script against the package
+ # 2 - Create the npm package using the package.json version tag ( or for beta releases, adds a beta tag and increments as needed )
+ # 3 - Publish the npm package
+ # 4 - For releases against the main branch, create a github release as well
 
 on:
   push:
     branches: [beta-*.*.*, beta]
   workflow_dispatch:
 
+concurrency:
+  group: build_and_publish
+  cancel-in-progress: true
+
 jobs:
   get_tags:
     runs-on: ubuntu-latest
 
     steps:
-      # checkout repo
-      - uses: actions/checkout@v4
-
-      # get branch / tag name
-      - name: Get Branch / Tag Name
-        id: get_branch
-        run: |
-          export BRANCH_NAME=$(if [[ ${GITHUB_REF} =~ "refs/tags/" ]]; then echo ${GITHUB_REF/refs\/tags\//}; else echo ${GITHUB_REF/refs\/heads\//}; fi)
-          echo $BRANCH_NAME
-          echo "BRANCH_NAME=${BRANCH_NAME}" >> $GITHUB_OUTPUT
-
-      # generate the image tag
-      - name: Get Image Tag
-        id: get_tag
-        run: |
-          export TARGET_IMAGE_TAG=$(if [ "${{ steps.get_branch.outputs.BRANCH_NAME }}" = "main" ]; then echo "main"; else echo "${{ steps.get_branch.outputs.BRANCH_NAME }}" | awk -F- '{ print $1 }'; fi)
-          echo $TARGET_IMAGE_TAG
-          echo "TARGET_IMAGE_TAG=${TARGET_IMAGE_TAG}" >> $GITHUB_OUTPUT
+    # checkout repo
+    - uses: actions/checkout@v5
+
+    # get branch / tag name
+    - name: Get Branch / Tag Name
+      id: get_branch
+      run: |
+        export BRANCH_NAME=$(if [[ ${GITHUB_REF} =~ "refs/tags/" ]]; then echo ${GITHUB_REF/refs\/tags\//}; else echo ${GITHUB_REF/refs\/heads\//}; fi)
+        echo $BRANCH_NAME
+        echo "BRANCH_NAME=${BRANCH_NAME}" >> $GITHUB_OUTPUT
+
+    # generate the image tag
+    - name: Get Image Tag
+      id: get_tag
+      run: |
+        export TARGET_IMAGE_TAG=$(if [ "${{ steps.get_branch.outputs.BRANCH_NAME }}" = "main" ]; then echo "main"; else echo "${{ steps.get_branch.outputs.BRANCH_NAME }}" | awk -F- '{ print $1 }'; fi)
+        echo $TARGET_IMAGE_TAG
+        echo "TARGET_IMAGE_TAG=${TARGET_IMAGE_TAG}" >> $GITHUB_OUTPUT
 
     outputs:
       BRANCH_NAME: ${{ steps.get_branch.outputs.BRANCH_NAME }}
@@ -47,38 +51,38 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      # checkout repo
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal access token.
-          fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository.
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-
-      - name: Retrieve github-markdown-toc
-        run: |
-          wget -q https://raw.githubusercontent.com/ekalinin/github-markdown-toc/master/gh-md-toc
-          chmod a+x gh-md-toc
-
-      - name: Create Table of Contents
-        run: |
-          npm run-script document --if-present
-          rm gh-md-toc
-
-      - name: Commit files
-        run: |
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-          git add * || true
-          git commit -a -m "Update TOC" || true
-
-      - name: Push changes
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.ref }}
+    # checkout repo
+    - uses: actions/checkout@v5
+      with:
+        persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal access token.
+        fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository.
+
+    - uses: actions/setup-node@v6
+      with:
+        node-version: lts/*
+
+    - name: Retrieve github-markdown-toc
+      run: |
+        wget -q https://raw.githubusercontent.com/ekalinin/github-markdown-toc/master/gh-md-toc
+        chmod a+x gh-md-toc
+
+    - name: Create Table of Contents
+      run: |
+        npm run-script document
+        rm gh-md-toc
+
+    - name: Commit files
+      run: |
+        git config --local user.email "github-actions[bot]@users.noreply.github.com"
+        git config --local user.name "github-actions[bot]"
+        git add *
+        git commit -a -m "Update TOC" || true
+
+    - name: Push changes
+      uses: ad-m/github-push-action@master
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        branch: ${{ github.ref }}
 
   publish_prod_release:
     permissions:
@@ -88,9 +92,9 @@ jobs:
     if: ${{ needs.get_tags.outputs.BRANCH_NAME == 'main' }}
     uses: homebridge/.github/.github/workflows/npm-publish.yml@latest
     with:
-      install_cmd: npm ci 
+      install_cmd: npm ci
     secrets:
-      npm_auth_token: ${{ secrets.NPM_TOKEN }}
+      npm_auth_token: ${{ secrets.npm_token }}
 
   publish_test_release:
     permissions:
@@ -102,24 +106,23 @@ jobs:
     with:
       tag: ${{ needs.get_tags.outputs.TARGET_IMAGE_TAG }}
       dynamically_adjust_version: true
-      npm_version_command: pre
+      npm_version_command: 'pre'
       pre_id: ${{ needs.get_tags.outputs.TARGET_IMAGE_TAG }}
-      install_cmd: npm ci 
     secrets:
-      npm_auth_token: ${{ secrets.NPM_TOKEN }}
+      npm_auth_token: ${{ secrets.npm_token }}
 
   publish_github_release:
     needs: [publish_prod_release]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - name: Create Release
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ needs.publish_prod_release.outputs.NPM_VERSION }}
-          name: Release ${{ needs.publish_prod_release.outputs.NPM_VERSION }}
-          generate_release_notes: true
-          draft: false
-          prerelease: false
+    - uses: actions/checkout@v5
+    - name: Create Release
+      uses: softprops/action-gh-release@v2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ needs.publish_prod_release.outputs.NPM_VERSION }}
+        name: Release ${{ needs.publish_prod_release.outputs.NPM_VERSION }}
+        generate_release_notes: true
+        draft: false
+        prerelease: false

package/README.md

@@ -200,6 +200,7 @@ With a plugin, you can see if it supports Real Time events, by opening the Home
 - Add common supported types Window, Window Covering, Light Sensor #151, tks @HDeKnop
 - HB-Control Node Turns Off then On when this message is received #152
 - Added `Debug logging` configuration option that creates a file `homebridge-automation-endpoints.json`, which contains all the homebridge devices discovered.  It can be used as part of troubleshooting device issues.
+- Fix for some camara devices not outputing events
 
 # Backlog / Roadmap
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-homebridge-automation",
-  "version": "0.3.0-beta.9",
+  "version": "0.3.1-beta.0",
   "description": "NodeRED Automation for HomeBridge",
   "main": "src/HAP-NodeRed.js",
   "scripts": {
@@ -28,10 +28,10 @@
     "@types/node-red": "^1.3.5",
     "@types/jest": "^29.5.14",
     "@eslint/js": "^9.16.0",
-    "eslint": "^8.57.1",
-    "eslint-plugin-format": "^0.1.2",
-    "eslint-plugin-jest": "^28.8.3",
-    "globals": "^15.13.0",
+    "eslint": "^9.36.0",
+    "eslint-plugin-format": "^1.0.2",
+    "eslint-plugin-jest": "^29.0.1",
+    "globals": "^16.4.0",
     "jest": "^29.7.0",
     "node-red": "^4.0.2",
     "node-red-node-test-helper": "^0.3.4",
@@ -41,8 +41,8 @@
   },
   "dependencies": {
     "better-queue": ">=3.8.12",
-    "debug": "^4.3.7",
-    "@homebridge/hap-client": "^2.1.0-beta.5"
+    "debug": "^4.4.1",
+    "@homebridge/hap-client": "^3.1.1"
   },
   "author": "NorthernMan54",
   "license": "ISC",

package/src/hbConfigNode.js

@@ -88,9 +88,9 @@ class HBConfigNode {
 
   toList(perms) {
     const supportedTypes = new Set([
-      'Battery', 'Carbon Dioxide Sensor', 'Carbon Monoxide Sensor', 'Camera Rtp Stream Management',
+      'Air Purifier', 'Air Quality Sensor', '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',
+      'Leak Sensor', 'Light Sensor', 'Lightbulb', 'Lock Mechanism', 'Motion Sensor', 'Occupancy Sensor',
       'Outlet', 'Smoke Sensor', 'Speaker', 'Stateless Programmable Switch', 'Switch',
       'Television', 'Temperature Sensor', 'Thermostat', 'Contact Sensor',
       'Window', 'Window Covering', 'Light Sensor'
@@ -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/src/hbControlNode.js

@@ -17,12 +17,12 @@ class HbControlNode extends hbBaseNode {
     const isCamera = this.hbDevice.type === 'CameraRTPStreamManagement';
     const payloadType = typeof message.payload;
 
-    // Validate payload
+    // Is the payload a valid JSON object?
+
     if (!isCamera && payloadType !== 'object') {
       const validNames = Object.keys(this.hbDevice.values)
         .filter(key => key !== 'ConfiguredName')
         .join(', ');
-
       this.error(
         `Invalid payload. Expected JSON object, e.g., {"On":false, "Brightness":0}. Valid values: ${validNames}`
       );
@@ -30,6 +30,16 @@ class HbControlNode extends hbBaseNode {
       return;
     }
 
+    // Validate payload
+    let keysToKeep = Object.keys(this.hbDevice.values);
+
+    Object.keys(message.payload).forEach(key => {
+      if (!keysToKeep.includes(key)) {
+        this.handleWarning(`Unhandled Characteristic '${key}'`);
+        delete message.payload[key];
+      }
+    });
+
     const results = [];
     let fill = 'green';
 
@@ -50,11 +60,13 @@ class HbControlNode extends hbBaseNode {
       } else {
         // Handle other characteristics
         try {
+          // debug('Setting value for', message.payload);
           const result = await this.hbDevice.setCharacteristicsByTypes(filterIfOff(message.payload));
+          // debug('Result', result.values);
           results.push(result.values);
         } catch (error) {
-          this.error(`Failed to set value for "${JSON.stringify(message.payload)}": ${error.message}`);
-          results.push({ 'Error': `Error: ${error.message}` });
+          this.error(`${error.message} for ${JSON.stringify(message.payload)}`);
+          results.push({ Error: `${error.message} for ${JSON.stringify(message.payload)}` });
           fill = 'red';
           this.hbConfigNode.disconnectClientNodes(this.hbDevice.instance);
         }

package/test/node-red/flows.json

@@ -54,37 +54,6 @@
         "macAddress": "",
         "debug": true
     },
-    {
-        "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",
@@ -2629,28 +2598,41 @@
         ]
     },
     {
-        "id": "5a0779448d4dcdb3",
-        "type": "mqtt in",
+        "id": "50af5bb963e4a186",
+        "type": "hb-resume",
         "z": "4138921fd7b9a926",
-        "name": "",
-        "topic": "home/#",
-        "qos": "2",
-        "datatype": "auto-detect",
-        "broker": "df5dd49178c517fa",
-        "nl": false,
-        "rap": true,
-        "rh": 0,
-        "inputs": 0,
-        "x": 130,
-        "y": 180,
+        "name": "Floor Lamp One",
+        "Homebridge": "homebridge",
+        "Manufacturer": "Signify Netherlands B.V.",
+        "Service": "Lightbulb",
+        "device": "homebridgeCC:22:3D:E3:CF:33Signify Netherlands B.V.Floor Lamp One00000043",
+        "conf": "7e647d67.f33acc",
+        "x": 500,
+        "y": 80,
         "wires": [
             [
-                "4510eba830da4c9d"
+                "8ba7a5a4aa28dc2f",
+                "29580d01ef2e651d"
             ]
         ]
     },
     {
-        "id": "d82488396ae950bf",
+        "id": "8ba7a5a4aa28dc2f",
+        "type": "hb-control",
+        "z": "4138921fd7b9a926",
+        "name": "Floor Lamp One",
+        "Homebridge": "homebridge",
+        "Manufacturer": "Signify Netherlands B.V.",
+        "Service": "Lightbulb",
+        "device": "homebridgeCC:22:3D:E3:CF:33Signify Netherlands B.V.Floor Lamp One00000043",
+        "conf": "7e647d67.f33acc",
+        "outputs": 0,
+        "x": 720,
+        "y": 80,
+        "wires": []
+    },
+    {
+        "id": "29580d01ef2e651d",
         "type": "debug",
         "z": "4138921fd7b9a926",
         "name": "debug 17",
@@ -2660,141 +2642,255 @@
         "tostatus": true,
         "complete": "payload",
         "targetType": "msg",
-        "statusVal": "device",
-        "statusType": "msg",
+        "statusVal": "payload",
+        "statusType": "auto",
         "x": 720,
         "y": 140,
         "wires": []
     },
     {
-        "id": "6f6d507ccce7460f",
-        "type": "switch",
+        "id": "b3c8e4dcd5b62de4",
+        "type": "inject",
         "z": "4138921fd7b9a926",
         "name": "",
-        "property": "shortTopic",
-        "propertyType": "msg",
-        "rules": [
+        "props": [
             {
-                "t": "eq",
-                "v": "SYStoMQTT",
-                "vt": "str"
+                "p": "payload"
             },
             {
-                "t": "eq",
-                "v": "version",
+                "p": "topic",
                 "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"On\": true}",
+        "payloadType": "json",
+        "x": 170,
+        "y": 80,
+        "wires": [
+            [
+                "50af5bb963e4a186"
+            ]
+        ]
+    },
+    {
+        "id": "a74ef133a980c5f3",
+        "type": "inject",
+        "z": "4138921fd7b9a926",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
             },
             {
-                "t": "eq",
-                "v": "LWT",
+                "p": "topic",
                 "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"On\": false}",
+        "payloadType": "json",
+        "x": 170,
+        "y": 140,
+        "wires": [
+            [
+                "50af5bb963e4a186"
+            ]
+        ]
+    },
+    {
+        "id": "1e6b8797f5279a1f",
+        "type": "inject",
+        "z": "4138921fd7b9a926",
+        "name": "{\"Brightness\":40,\"On\":true,\"ColorTemperature\":242}",
+        "props": [
+            {
+                "p": "payload"
             },
             {
-                "t": "else"
+                "p": "topic",
+                "vt": "str"
             }
         ],
-        "checkall": "false",
-        "repair": false,
-        "outputs": 4,
-        "x": 530,
-        "y": 180,
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"Brightness\":40,\"On\":true,\"ColorTemperature\":242}",
+        "payloadType": "json",
+        "x": 290,
+        "y": 260,
         "wires": [
             [
-                "d82488396ae950bf"
-            ],
-            [],
-            [
-                "1649c3dc535b26f2"
-            ],
+                "50af5bb963e4a186"
+            ]
+        ]
+    },
+    {
+        "id": "4bb2bae9fe4ffbbb",
+        "type": "hb-status",
+        "z": "4138921fd7b9a926",
+        "name": "Floor Lamp One",
+        "Homebridge": "homebridge",
+        "Manufacturer": "Signify Netherlands B.V.",
+        "Service": "Lightbulb",
+        "device": "homebridgeCC:22:3D:E3:CF:33Signify Netherlands B.V.Floor Lamp One00000043",
+        "conf": "7e647d67.f33acc",
+        "x": 300,
+        "y": 440,
+        "wires": [
             [
-                "d7a34617ef5e9f31"
+                "96ad615138d1254e"
             ]
         ]
     },
     {
-        "id": "45cb1d621afc9b52",
+        "id": "96ad615138d1254e",
         "type": "debug",
         "z": "4138921fd7b9a926",
         "name": "debug 18",
-        "active": false,
+        "active": true,
         "tosidebar": true,
         "console": false,
         "tostatus": true,
-        "complete": "true",
-        "targetType": "full",
-        "statusVal": "topic",
+        "complete": "payload",
+        "targetType": "msg",
+        "statusVal": "payload",
         "statusType": "auto",
-        "x": 320,
-        "y": 360,
+        "x": 520,
+        "y": 400,
         "wires": []
     },
     {
-        "id": "4510eba830da4c9d",
-        "type": "function",
+        "id": "7b085aa32101811e",
+        "type": "hb-event",
         "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,
+        "name": "Floor Lamp One",
+        "Homebridge": "homebridge",
+        "Manufacturer": "Signify Netherlands B.V.",
+        "Service": "Lightbulb",
+        "device": "homebridgeCC:22:3D:E3:CF:33Signify Netherlands B.V.Floor Lamp One00000043",
+        "conf": "7e647d67.f33acc",
+        "sendInitialState": true,
+        "x": 300,
+        "y": 360,
+        "wires": [
+            [
+                "96ad615138d1254e"
+            ]
+        ]
+    },
+    {
+        "id": "247bb4b9017d5ed3",
+        "type": "catch",
+        "z": "4138921fd7b9a926",
+        "name": "",
+        "scope": null,
+        "uncaught": false,
+        "x": 280,
+        "y": 520,
         "wires": [
             [
-                "6f6d507ccce7460f",
-                "45cb1d621afc9b52"
+                "ecfe37f30b4b452f"
             ]
         ]
     },
     {
-        "id": "d7a34617ef5e9f31",
+        "id": "ecfe37f30b4b452f",
         "type": "debug",
         "z": "4138921fd7b9a926",
         "name": "debug 19",
-        "active": false,
+        "active": true,
         "tosidebar": true,
         "console": false,
         "tostatus": true,
         "complete": "payload",
         "targetType": "msg",
-        "statusVal": "shortTopic",
-        "statusType": "msg",
-        "x": 720,
-        "y": 260,
+        "statusVal": "payload",
+        "statusType": "auto",
+        "x": 540,
+        "y": 520,
         "wires": []
     },
     {
-        "id": "1649c3dc535b26f2",
+        "id": "f775ab948cea1532",
+        "type": "status",
+        "z": "4138921fd7b9a926",
+        "name": "",
+        "scope": null,
+        "x": 280,
+        "y": 580,
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "dd3e9950ef4f1482",
         "type": "debug",
         "z": "4138921fd7b9a926",
         "name": "debug 20",
-        "active": false,
+        "active": true,
         "tosidebar": true,
         "console": false,
         "tostatus": true,
-        "complete": "payload",
-        "targetType": "msg",
-        "statusVal": "device",
-        "statusType": "msg",
-        "x": 720,
-        "y": 200,
+        "complete": "true",
+        "targetType": "full",
+        "statusVal": "payload",
+        "statusType": "auto",
+        "x": 540,
+        "y": 580,
         "wires": []
     },
+    {
+        "id": "64d1e3d573689b65",
+        "type": "inject",
+        "z": "4138921fd7b9a926",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"ColorTemperature\": false}",
+        "payloadType": "json",
+        "x": 150,
+        "y": 200,
+        "wires": [
+            [
+                "8ba7a5a4aa28dc2f"
+            ]
+        ]
+    },
     {
         "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": [
             [
@@ -2820,7 +2916,7 @@
         "checkall": "true",
         "repair": false,
         "outputs": 1,
-        "x": 270,
+        "x": 370,
         "y": 220,
         "wires": [
             [
@@ -2847,7 +2943,7 @@
         "from": "",
         "to": "",
         "reg": false,
-        "x": 460,
+        "x": 540,
         "y": 220,
         "wires": [
             [
@@ -2859,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": [
             [
@@ -2881,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": []
     },
@@ -2928,7 +3024,7 @@
         "checkall": "true",
         "repair": false,
         "outputs": 1,
-        "x": 270,
+        "x": 330,
         "y": 340,
         "wires": [
             [
@@ -2955,7 +3051,7 @@
         "from": "",
         "to": "",
         "reg": false,
-        "x": 460,
+        "x": 540,
         "y": 340,
         "wires": [
             [
@@ -2974,7 +3070,7 @@
         "device": "ECI-T24F2CB:6F:94:DD:43:77HikVisionDriveway 8E5200000110",
         "conf": "7e647d67.f33acc",
         "outputs": 1,
-        "x": 680,
+        "x": 740,
         "y": 340,
         "wires": [
             [
@@ -3018,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": []
     },
@@ -3056,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"
+            ]
+        ]
     }
 ]