Release Candidate 1.7.0

.github/workflows/codeql-analysis.yml

@@ -31,16 +31,16 @@ jobs:
         language: [ 'javascript' ]
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: ${{ matrix.language }}
 
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1

.github/workflows/publish-dev.yml

@@ -9,10 +9,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
       - run: |
           npm ci
           npm run build
@@ -22,10 +22,10 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           registry-url: https://registry.npmjs.org/
           always-auth: true
       - name: Extract PACKAGE_VERSION
@@ -34,8 +34,8 @@ jobs:
       - name: Prepare Discord notification messages
         id: discord-prepare
         run: |
-         echo ::set-output name=DISCORD_MSG_DEV_ANN::'{"title":"New dev version `${{ steps.package-version.outputs.current-version }}` has been released.","description":"Changelog is available [here](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/commits/dev/CHANGELOG.md)","url":"https://github.com/NRCHKB/node-red-contrib-homekit-bridged/tree/dev","color":9371648,"fields":[{"name":"How to install","value":"1. Stop node-red\n2. Backup `~/.node-red` folder\n3. `cd ~/.node-red`\n4. `npm i node-red-contrib-homekit-bridged@${{ steps.package-version.outputs.current-version }}`\n5. Start node-red"}]}' 
-         echo ::set-output name=DISCORD_MSG_ERROR::'{"title":"Dev version `${{ steps.package-version.outputs.current-version }}` failed to be released.","description":"Changelog is available [here](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/commits/dev/CHANGELOG.md)","url":"https://github.com/NRCHKB/node-red-contrib-homekit-bridged/tree/dev","color":9371648,"fields":[{"name":"How to install","value":"1. Stop node-red\n2. Backup `~/.node-red` folder\n3. `cd ~/.node-red`\n4. `npm i node-red-contrib-homekit-bridged@${{ steps.package-version.outputs.current-version }}`\n5. Start node-red"}]}'
+          echo ::set-output name=DISCORD_MSG_DEV_ANN::'{"title":"New dev version `${{ steps.package-version.outputs.current-version }}` has been released.","description":"Changelog is available [here](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/commits/dev/CHANGELOG.md)","url":"https://github.com/NRCHKB/node-red-contrib-homekit-bridged/tree/dev","color":9371648,"fields":[{"name":"How to install","value":"1. Stop node-red\n2. Backup `~/.node-red` folder\n3. `cd ~/.node-red`\n4. `npm i node-red-contrib-homekit-bridged@${{ steps.package-version.outputs.current-version }}`\n5. Start node-red"}]}' 
+          echo ::set-output name=DISCORD_MSG_ERROR::'{"title":"Dev version `${{ steps.package-version.outputs.current-version }}` failed to be released.","description":"Changelog is available [here](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/commits/dev/CHANGELOG.md)","url":"https://github.com/NRCHKB/node-red-contrib-homekit-bridged/tree/dev","color":9371648,"fields":[{"name":"How to install","value":"1. Stop node-red\n2. Backup `~/.node-red` folder\n3. `cd ~/.node-red`\n4. `npm i node-red-contrib-homekit-bridged@${{ steps.package-version.outputs.current-version }}`\n5. Start node-red"}]}'
       - name: Publish
         if: contains(steps.package-version.outputs.current-version, 'dev') == true
         run: |

.github/workflows/publish.yml

@@ -9,10 +9,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
       - run: |
           npm ci
           npm run build
@@ -22,10 +22,10 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           registry-url: https://registry.npmjs.org/
           always-auth: true
       - name: Extract PACKAGE_VERSION
@@ -47,10 +47,10 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           registry-url: https://npm.pkg.github.com/
           scope: '@nrchkb'
       - name: Extract PACKAGE_VERSION
@@ -64,3 +64,9 @@ jobs:
           npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.GHUB_TKN}}
+      - name: Update Node-Red flow-library
+        if: contains(steps.package-version.outputs.current-version, 'dev') != true
+        uses: Zehir/update-package-node-red-flow-library-action@v1.0.5
+        continue-on-error: true
+        with:
+          package-name: 'node-red-contrib-homekit-bridged'

.github/workflows/tests.yml

@@ -1,17 +1,17 @@
 name: Tests
 
-on: [pull_request]
+on: [ pull_request ]
 
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node_version: [12, 14, 16, 18]
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        node_version: [ 18, 20, 22 ]
+        os: [ ubuntu-latest, windows-latest, macOS-latest ]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - name: build and test

CHANGELOG.md

@@ -2,15 +2,33 @@
 
 ##### Before upgrading make sure that you are using the latest version of [Node-RED](https://nodered.org/docs/getting-started/local) and latest LTS version of [Node.js](https://nodejs.org/en/download/)
 
-###### Upgrading from versions 0.X to 1.X is a breaking change, all devices will be reset in the Home app. Please review the [release notes](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/releases/tag/v1.0.1) thoroughly before updating!
-
 # Changelog
 
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.7.0]
+
+### Fixed
+
+- Removed vulnerable module 'ip' [#545](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/545)
+- msg.context now handled properly
+
+### Added
+
+- Adaptive Lighting support [#335](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/335)
+- By default, registered Eve.app Characteristics for power management - for existing setup, requires old custom characteristics file to be removed
+
+### Changed
+
+- Updated hap-nodejs [0.11.1 to 0.12.2](https://github.com/homebridge/HAP-NodeJS/blob/latest/CHANGELOG.md) (features
+  and bug fixes)
+- Dependencies upgrade
+- Node `10`, `12` and `16` no longer supported
+- Updated GitHub Actions
+
 ## [1.6.1] - 2024-02-19
 
 ### Fixed

build/nodes/service.html

@@ -194,6 +194,25 @@
         </div>
     </div>
 
+    <div id="adaptive-lightning-configuration" style="display: none; border: 1px solid var(--red-ui-secondary-border-color); padding: 12px 12px 0 12px; margin-bottom: 12px;">
+        <label>&nbsp;&nbsp;<i class="fa fa-cog"></i> Adaptive Lightning Configuration</label>
+        <div class="form-row">
+            <label for="node-input-adaptiveLightingOptionsEnable"><i class="fa fa-toggle-on"></i> Enable</label>
+            <input type="checkbox" id="node-input-adaptiveLightingOptionsEnable">
+        </div>
+        <div class="form-row">
+            <label for="node-input-adaptiveLightingOptionsMode"><i class="fa fa-hand-o-up"></i> Mode</label>
+            <select id="node-input-adaptiveLightingOptionsMode">
+                <option value="1" selected="selected">AUTOMATIC</option>
+                <option value="2" disabled>MANUAL</option>
+            </select>
+        </div>
+        <div class="form-row">
+            <label for="node-input-adaptiveLightingOptionsCustomTemperatureAdjustment"><i class="fa fa-thermometer-quarter"></i> Custom Temperature Adjustment</label>
+            <input type="number" id="node-input-adaptiveLightingOptionsCustomTemperatureAdjustment">
+        </div>
+    </div>
+
     <div class="form-row">
         <label for="node-input-characteristicProperties"><i class="fa fa-wrench"></i> Characteristic Properties</label>
         <input type="text" id="node-input-characteristicProperties" style="width: 70%">
@@ -474,7 +493,18 @@ <h2 id="toc_8">Characteristic Properties</h2>
             },
             outputs: {
                 value: 2,
-            }
+            },
+            adaptiveLightingOptionsEnable: {
+                value: false,
+            },
+            adaptiveLightingOptionsMode: {
+                value: 1,
+                validate: RED.validators.number()
+            },
+            adaptiveLightingOptionsCustomTemperatureAdjustment: {
+                value: 0,
+                validate: RED.validators.number()
+            },
         },
         inputs: 1,
         outputs: 2,
@@ -581,6 +611,7 @@ <h2 id="toc_8">Characteristic Properties</h2>
             })
 
             let cameraConfiguration = $('#camera-configuration')
+            let adaptiveLightningConfiguration = $('#adaptive-lightning-configuration')
 
             selectServiceName
                 .find('option')
@@ -601,6 +632,16 @@ <h2 id="toc_8">Characteristic Properties</h2>
                 })
                 .change()
 
+            selectServiceName
+                .change(function () {
+                    if (this.value === 'Lightbulb') {
+                        adaptiveLightningConfiguration.fadeIn('fast')
+                    } else {
+                        adaptiveLightningConfiguration.fadeOut('fast')
+                    }
+                })
+                .change()
+
             $('#node-input-characteristicProperties').typedInput({
                 type: 'json',
                 types: ['json'],

build/nodes/service2.html

@@ -194,6 +194,25 @@
         </div>
     </div>
 
+    <div id="adaptive-lightning-configuration" style="display: none; border: 1px solid var(--red-ui-secondary-border-color); padding: 12px 12px 0 12px; margin-bottom: 12px;">
+        <label>&nbsp;&nbsp;<i class="fa fa-cog"></i> Adaptive Lightning Configuration</label>
+        <div class="form-row">
+            <label for="node-input-adaptiveLightingOptionsEnable"><i class="fa fa-toggle-on"></i> Enable</label>
+            <input type="checkbox" id="node-input-adaptiveLightingOptionsEnable">
+        </div>
+        <div class="form-row">
+            <label for="node-input-adaptiveLightingOptionsMode"><i class="fa fa-hand-o-up"></i> Mode</label>
+            <select id="node-input-adaptiveLightingOptionsMode">
+                <option value="1" selected="selected">AUTOMATIC</option>
+                <option value="2" disabled>MANUAL</option>
+            </select>
+        </div>
+        <div class="form-row">
+            <label for="node-input-adaptiveLightingOptionsCustomTemperatureAdjustment"><i class="fa fa-thermometer-quarter"></i> Custom Temperature Adjustment</label>
+            <input type="number" id="node-input-adaptiveLightingOptionsCustomTemperatureAdjustment">
+        </div>
+    </div>
+
     <div class="form-row">
         <label for="node-input-characteristicProperties"><i class="fa fa-wrench"></i> Characteristic Properties</label>
         <input type="text" id="node-input-characteristicProperties" style="width: 70%">
@@ -484,7 +503,18 @@ <h2 id="toc_8">Characteristic Properties</h2>
             },
             outputs: {
                 value: 1,
-            }
+            },
+            adaptiveLightingOptionsEnable: {
+                value: false,
+            },
+            adaptiveLightingOptionsMode: {
+                value: 1,
+                validate: RED.validators.number()
+            },
+            adaptiveLightingOptionsCustomTemperatureAdjustment: {
+                value: 0,
+                validate: RED.validators.number()
+            },
         },
         inputs: 1,
         outputs: 1,
@@ -583,6 +613,7 @@ <h2 id="toc_8">Characteristic Properties</h2>
             })
 
             let cameraConfiguration = $('#camera-configuration')
+            let adaptiveLightningConfiguration = $('#adaptive-lightning-configuration')
 
             selectServiceName
                 .find('option')
@@ -603,6 +634,16 @@ <h2 id="toc_8">Characteristic Properties</h2>
                 })
                 .change()
 
+            selectServiceName
+                .change(function () {
+                    if (this.value === 'Lightbulb') {
+                        adaptiveLightningConfiguration.fadeIn('fast')
+                    } else {
+                        adaptiveLightningConfiguration.fadeOut('fast')
+                    }
+                })
+                .change()
+
             $('#node-input-characteristicProperties').typedInput({
                 type: 'json',
                 types: ['json'],