Adaptive Lightning manual mode WIP, update event output

NRCHKB · Jun 22, 2024 · 271d027 · 271d027
1 parent bd712d8
commit 271d027
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 3 deletions.
diff --git a/build/nodes/service.html b/build/nodes/service.html
@@ -205,7 +205,7 @@
             <select id="node-input-adaptiveLightingOptionsMode">
                 <option value="" selected hidden disabled>AUTOMATIC</option>
                 <option value="1">AUTOMATIC</option>
-                <option value="2" disabled>MANUAL</option>
+                <option value="2">MANUAL</option>
             </select>
         </div>
         <div class="form-row">

diff --git a/build/nodes/service2.html b/build/nodes/service2.html
@@ -205,7 +205,7 @@
             <select id="node-input-adaptiveLightingOptionsMode">
                 <option value="" selected hidden disabled>AUTOMATIC</option>
                 <option value="1">AUTOMATIC</option>
-                <option value="2" disabled>MANUAL</option>
+                <option value="2">MANUAL</option>
             </select>
         </div>
         <div class="form-row">

diff --git a/src/lib/types/HAPServiceNodeType.ts b/src/lib/types/HAPServiceNodeType.ts
@@ -1,5 +1,6 @@
 import {
     Accessory,
+    AdaptiveLightingController,
     Characteristic,
     CharacteristicChange,
     CharacteristicGetCallback,
@@ -56,6 +57,7 @@ type HAPServiceNodeType = NodeType & {
     // Is Accessory reachable? On Linked Service it will be undefined. If is not true then NO_RESPONSE
     reachable?: boolean
     nodeStatusUtils: NodeStatusUtils
+    adaptiveLightingController?: AdaptiveLightingController
 }
 
 export default HAPServiceNodeType
diff --git a/src/lib/utils/ServiceUtils.ts b/src/lib/utils/ServiceUtils.ts
@@ -3,6 +3,7 @@ import * as util from 'node:util'
 import { logger } from '@nrchkb/logger'
 import {
     Accessory,
+    ActiveAdaptiveLightingTransition,
     AdaptiveLightingController,
     AdaptiveLightingControllerMode,
     AdaptiveLightingOptions,
@@ -32,7 +33,7 @@ module.exports = function (node: HAPServiceNodeType) {
 
     const NO_RESPONSE_MSG = 'NO_RESPONSE'
 
-    const prepareHapData = (context: any, connection?: HAPConnection) => {
+    const prepareHapData = (context?: any, connection?: HAPConnection) => {
         const hap: { [key: string]: any } = {}
 
         if (connection) {
@@ -262,6 +263,15 @@ module.exports = function (node: HAPServiceNodeType) {
 
         Object.keys(msg.payload).map((key: string) => {
             if (node.supported.indexOf(key) < 0) {
+                if (key === 'AdaptiveLightingController') {
+                    const value = msg.payload?.[key]
+                    const event = value?.event
+
+                    if (event === 'disable') {
+                        node.adaptiveLightingController?.disableAdaptiveLighting()
+                    }
+                }
+
                 log.error(
                     `Instead of '${key}' try one of these characteristics: '${node.supported.join(
                         "', '"
@@ -500,7 +510,44 @@ module.exports = function (node: HAPServiceNodeType) {
                 const adaptiveLightingController =
                     new AdaptiveLightingController(node.service, options)
 
+                adaptiveLightingController.on('update', () => {
+                    const activeAdaptiveLightingTransition: Partial<ActiveAdaptiveLightingTransition> =
+                        {
+                            transitionStartMillis:
+                                adaptiveLightingController.getAdaptiveLightingStartTimeOfTransition(),
+                            timeMillisOffset:
+                                adaptiveLightingController.getAdaptiveLightingTimeOffset(),
+                            transitionCurve:
+                                adaptiveLightingController.getAdaptiveLightingTransitionCurve(),
+                            brightnessAdjustmentRange:
+                                adaptiveLightingController.getAdaptiveLightingBrightnessMultiplierRange(),
+                            updateInterval:
+                                adaptiveLightingController.getAdaptiveLightingUpdateInterval(),
+                            notifyIntervalThreshold:
+                                adaptiveLightingController.getAdaptiveLightingNotifyIntervalThreshold(),
+                        }
+                    node.send({
+                        payload: {
+                            AdaptiveLightingController: {
+                                event: 'update',
+                                data: activeAdaptiveLightingTransition,
+                            },
+                        },
+                    })
+                })
+                adaptiveLightingController.on('disable', () => {
+                    node.send({
+                        payload: {
+                            AdaptiveLightingController: {
+                                event: 'disable',
+                            },
+                        },
+                    })
+                })
+
                 node.accessory.configureController(adaptiveLightingController)
+
+                node.adaptiveLightingController = adaptiveLightingController
             } catch (error) {
                 log.error(
                     `Failed to configure Adaptive Lightning due to ${error}`