node-red-contrib-homekit-bridged 1.7.0-dev.1 → 1.7.0-dev.10

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Node-RED Contribution - HomeKit Bridged
+Copyright (c) 2024 Node-RED Contribution - HomeKit Bridged
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/build/lib/HAPHostNode.js

@@ -22,7 +22,7 @@ const HostType_1 = __importDefault(require("./types/HostType"));
 module.exports = (RED, hostType) => {
     const MdnsUtils = require('./utils/MdnsUtils')();
     const init = function (config) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         const self = this;
         const log = (0, logger_1.logger)('NRCHKB', 'HAPHostNode', config.bridgeName, self);
         self.hostType = hostType;
@@ -36,7 +36,8 @@ module.exports = (RED, hostType) => {
         if (preload_1.default.parse(config.firmwareRev) == null) {
             config.firmwareRev = new semver_1.SemVer('0.0.0');
         }
-        if (config.customMdnsConfig) {
+        if (!((_a = config.bind) === null || _a === void 0 ? void 0 : _a.length) && config.customMdnsConfig) {
+            log.error('Custom mdns config is deprecated, use bind instead!');
             self.mdnsConfig = {};
             if (MdnsUtils.checkMulticast(config.mdnsMulticast)) {
                 self.mdnsConfig.multicast = config.mdnsMulticast;
@@ -45,13 +46,13 @@ module.exports = (RED, hostType) => {
                 self.mdnsConfig.interface = config.mdnsInterface;
             }
             if (MdnsUtils.checkPort(config.mdnsPort)) {
-                self.mdnsConfig.port = parseInt((_a = config.mdnsPort) === null || _a === void 0 ? void 0 : _a.toString());
+                self.mdnsConfig.port = parseInt((_b = config.mdnsPort) === null || _b === void 0 ? void 0 : _b.toString());
             }
             if (MdnsUtils.checkIp(config.mdnsIp)) {
                 self.mdnsConfig.ip = config.mdnsIp;
             }
             if (MdnsUtils.checkTtl(config.mdnsTtl)) {
-                self.mdnsConfig.ttl = parseInt((_b = config.mdnsTtl) === null || _b === void 0 ? void 0 : _b.toString());
+                self.mdnsConfig.ttl = parseInt((_c = config.mdnsTtl) === null || _c === void 0 ? void 0 : _c.toString());
             }
             if (MdnsUtils.checkLoopback(config.mdnsLoopback)) {
                 self.mdnsConfig.loopback = config.mdnsLoopback;
@@ -81,7 +82,7 @@ module.exports = (RED, hostType) => {
             self.host = new hap_nodejs_1.Accessory(self.name, hostUUID);
         }
         self.publish = function () {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             if (self.hostType == HostType_1.default.BRIDGE) {
                 log.debug(`Publishing ${hostTypeName} with pin code ${self.config.pinCode} and ${self.host.bridgedAccessories.length} accessories`);
             }
@@ -99,6 +100,15 @@ module.exports = (RED, hostType) => {
                 oldPinCode = oldPinCode.replace(/-/g, '');
                 oldPinCode = `${oldPinCode.slice(0, 3)}-${oldPinCode.slice(3, 5)}-${oldPinCode.slice(5, 8)}`;
             }
+            let bind;
+            if (((_c = self.config.bind) === null || _c === void 0 ? void 0 : _c.length) && self.config.bindType) {
+                if (self.config.bindType == 'str') {
+                    bind = self.config.bind;
+                }
+                else if (self.config.bindType == 'json') {
+                    bind = JSON.parse(self.config.bind);
+                }
+            }
             self.host.publish({
                 username: self.bridgeUsername,
                 port: self.config.port && !isNaN(self.config.port)
@@ -107,7 +117,8 @@ module.exports = (RED, hostType) => {
                 pincode: oldPinCode,
                 category: self.accessoryCategory,
                 mdns: self.mdnsConfig,
-                advertiser: (_c = self.config.advertiser) !== null && _c !== void 0 ? _c : "bonjour-hap",
+                bind: bind,
+                advertiser: (_d = self.config.advertiser) !== null && _d !== void 0 ? _d : "bonjour-hap",
             }, self.config.allowInsecureRequest);
             self.published = true;
             return true;
@@ -141,9 +152,9 @@ module.exports = (RED, hostType) => {
             .setCharacteristic(hap_nodejs_1.Characteristic.Manufacturer, self.config.manufacturer)
             .setCharacteristic(hap_nodejs_1.Characteristic.SerialNumber, self.config.serialNo)
             .setCharacteristic(hap_nodejs_1.Characteristic.Model, self.config.model)
-            .setCharacteristic(hap_nodejs_1.Characteristic.FirmwareRevision, (_c = self.config.firmwareRev) === null || _c === void 0 ? void 0 : _c.toString())
-            .setCharacteristic(hap_nodejs_1.Characteristic.HardwareRevision, (_d = self.config.hardwareRev) === null || _d === void 0 ? void 0 : _d.toString())
-            .setCharacteristic(hap_nodejs_1.Characteristic.SoftwareRevision, (_e = self.config.softwareRev) === null || _e === void 0 ? void 0 : _e.toString());
+            .setCharacteristic(hap_nodejs_1.Characteristic.FirmwareRevision, (_d = self.config.firmwareRev) === null || _d === void 0 ? void 0 : _d.toString())
+            .setCharacteristic(hap_nodejs_1.Characteristic.HardwareRevision, (_e = self.config.hardwareRev) === null || _e === void 0 ? void 0 : _e.toString())
+            .setCharacteristic(hap_nodejs_1.Characteristic.SoftwareRevision, (_f = self.config.softwareRev) === null || _f === void 0 ? void 0 : _f.toString());
     };
     const macify = (nodeId) => {
         if (nodeId) {

package/build/lib/HAPServiceNode.js

@@ -95,8 +95,9 @@ module.exports = (RED) => {
                 : self.config.accessoryId;
             self.hostNode = RED.nodes.getNode(hostId);
             if (!self.hostNode) {
-                log.error('Host Node not found', false);
-                throw new NRCHKBError_1.default('Host Node not found');
+                const message = `Host node ${self.config.hostType == HostType_1.default.BRIDGE ? 'Bridge' : 'Standalone Accessory'} ${hostId} not found`;
+                log.error(message, false);
+                throw new NRCHKBError_1.default(message);
             }
             self.childNodes = [];
             self.childNodes.push(self);
@@ -161,6 +162,7 @@ module.exports = (RED) => {
             config: self.config,
         }, self.parentService);
         self.characteristicProperties = CharacteristicUtils.load(self.service, self.config);
+        ServiceUtils.configureAdaptiveLightning();
         if (self.config.isParent) {
             BridgeUtils.delayedPublish(self);
         }

package/build/lib/HAPServiceNode2.js

@@ -95,8 +95,9 @@ module.exports = (RED) => {
                 : self.config.accessoryId;
             self.hostNode = RED.nodes.getNode(hostId);
             if (!self.hostNode) {
-                log.error('Host Node not found', false);
-                throw new NRCHKBError_1.default('Host Node not found');
+                const message = `Host node ${self.config.hostType == HostType_1.default.BRIDGE ? 'Bridge' : 'Standalone Accessory'} ${hostId} not found`;
+                log.error(message, false);
+                throw new NRCHKBError_1.default(message);
             }
             self.childNodes = [];
             self.childNodes.push(self);
@@ -161,6 +162,7 @@ module.exports = (RED) => {
             config: self.config,
         }, self.parentService);
         self.characteristicProperties = CharacteristicUtils.load(self.service, self.config);
+        ServiceUtils.configureAdaptiveLightning();
         if (self.config.isParent) {
             BridgeUtils.delayedPublish(self);
         }

package/build/lib/api.js

@@ -25,6 +25,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = require("@nrchkb/logger");
 const hap_nodejs_1 = require("hap-nodejs");
+const EveCharacteristics_1 = __importDefault(require("./hap/eve-app/EveCharacteristics"));
 const Storage_1 = require("./Storage");
 const HapCategories_1 = __importDefault(require("./types/hap-nodejs/HapCategories"));
 const version = require('../../package.json').version.trim();
@@ -127,9 +128,9 @@ module.exports = function (RED) {
         });
     };
     const _initNRCHKBCustomCharacteristicsAPI = () => __awaiter(this, void 0, void 0, function* () {
-        const getCustomCharacteristics = () => {
-            return Storage_1.Storage.loadCustomCharacteristics()
-                .then((value) => {
+        const getCustomCharacteristics = () => __awaiter(this, void 0, void 0, function* () {
+            try {
+                const value = yield Storage_1.Storage.loadCustomCharacteristics();
                 log.trace('loadCustomCharacteristics()');
                 log.trace(value);
                 if (Array.isArray(value)) {
@@ -137,14 +138,14 @@ module.exports = function (RED) {
                 }
                 else {
                     log.debug('customCharacteristics is not Array, returning empty value');
-                    return [];
+                    return EveCharacteristics_1.default;
                 }
-            })
-                .catch((error) => {
+            }
+            catch (error) {
                 log.error(`Failed to get customCharacteristics in nrchkbStorage due to ${error}`);
-                return [];
-            });
-        };
+                return EveCharacteristics_1.default;
+            }
+        });
         const characteristicNameToKey = (name) => {
             return name.replace(' ', '');
         };
@@ -260,7 +261,7 @@ module.exports = function (RED) {
             });
         }));
         RED.httpAdmin.post('/nrchkb/config', RED.auth.needsPermission('nrchkb.write'), (req, res) => __awaiter(this, void 0, void 0, function* () {
-            const customCharacteristics = req.body.customCharacteristics || [];
+            const customCharacteristics = req.body.customCharacteristics || EveCharacteristics_1.default;
             Storage_1.Storage.saveCustomCharacteristics(customCharacteristics)
                 .then(() => {
                 res.sendStatus(200);

package/build/lib/hap/HAPCharacteristic.d.ts

@@ -0,0 +1,9 @@
+import { Characteristic } from 'hap-nodejs';
+import { EveS2R1, EveS2R2, EveS2W1, EveS2W2 } from './eve-app/EveCharacteristics';
+declare class HAPCharacteristic extends Characteristic {
+    static EveS2R1: typeof EveS2R1;
+    static EveS2R2: typeof EveS2R2;
+    static EveS2W1: typeof EveS2W1;
+    static EveS2W2: typeof EveS2W2;
+}
+export default HAPCharacteristic;

package/build/lib/hap/HAPCharacteristic.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const hap_nodejs_1 = require("hap-nodejs");
+class HAPCharacteristic extends hap_nodejs_1.Characteristic {
+}
+exports.default = HAPCharacteristic;

package/build/lib/hap/HAPService.d.ts

@@ -0,0 +1,6 @@
+import { Service } from 'hap-nodejs';
+import { EveHistoryData } from './eve-app/EveServices';
+declare class HAPService extends Service {
+    static EveHistoryData: typeof EveHistoryData;
+}
+export default HAPService;

package/build/lib/hap/HAPService.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const hap_nodejs_1 = require("hap-nodejs");
+class HAPService extends hap_nodejs_1.Service {
+}
+exports.default = HAPService;

package/build/lib/hap/eve-app/EveCharacteristics.d.ts

@@ -0,0 +1,20 @@
+import CustomCharacteristicType from '../../types/CustomCharacteristicType';
+import HAPCharacteristic from '../HAPCharacteristic';
+declare const EveCharacteristics: CustomCharacteristicType[];
+export declare class EveS2R1 extends HAPCharacteristic {
+    static readonly UUID: string;
+    constructor();
+}
+export declare class EveS2R2 extends HAPCharacteristic {
+    static readonly UUID: string;
+    constructor();
+}
+export declare class EveS2W1 extends HAPCharacteristic {
+    static readonly UUID: string;
+    constructor();
+}
+export declare class EveS2W2 extends HAPCharacteristic {
+    static readonly UUID: string;
+    constructor();
+}
+export default EveCharacteristics;

package/build/lib/hap/eve-app/EveCharacteristics.js

@@ -0,0 +1,89 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EveS2W2 = exports.EveS2W1 = exports.EveS2R2 = exports.EveS2R1 = void 0;
+const HAPCharacteristic_1 = __importDefault(require("../HAPCharacteristic"));
+const EveCharacteristics = [
+    {
+        UUID: 'E863F10A-079E-48FF-8F27-9C2605A29F52',
+        name: 'Eve-Volt',
+        format: "float",
+        perms: ["pr"],
+        description: 'Volt (V) value. Used by Eve.app.',
+    },
+    {
+        UUID: 'E863F126-079E-48FF-8F27-9C2605A29F52',
+        name: 'Eve-Ampere',
+        format: "float",
+        perms: ["pr"],
+        description: 'Ampere (A) value. Used by Eve.app.',
+    },
+    {
+        UUID: 'E863F10D-079E-48FF-8F27-9C2605A29F52',
+        name: 'Eve-Watt',
+        format: "float",
+        perms: ["pr"],
+        description: 'Watt (W) value. Used by Eve.app, reported as "Consumption".',
+    },
+    {
+        UUID: 'E863F10C-079E-48FF-8F27-9C2605A29F52',
+        name: 'Eve-Kilowatt-hour',
+        format: "float",
+        perms: ["pr"],
+        description: 'Kilowatt-hour (kWh) value. Used by Eve.app, reported as Total Consumption.',
+    },
+    {
+        UUID: 'E863F110-079E-48FF-8F27-9C2605A29F52',
+        name: 'Eve-Volt-Ampere',
+        format: "uint16",
+        perms: ["pr"],
+        description: 'Volt-Ampere (VA) value. Used by Eve.app.',
+    },
+];
+class EveS2R1 extends HAPCharacteristic_1.default {
+    constructor() {
+        super('Eve-S2R1', EveS2R1.UUID, {
+            format: "data",
+            perms: ["pr", "ev", "hd"],
+        });
+    }
+}
+exports.EveS2R1 = EveS2R1;
+EveS2R1.UUID = 'E863F116-079E-48FF-8F27-9C2605A29F52';
+HAPCharacteristic_1.default.EveS2R1 = EveS2R1;
+class EveS2R2 extends HAPCharacteristic_1.default {
+    constructor() {
+        super('Eve-S2R2', EveS2R2.UUID, {
+            format: "data",
+            perms: ["pr", "ev", "hd"],
+        });
+    }
+}
+exports.EveS2R2 = EveS2R2;
+EveS2R2.UUID = 'E863F117-079E-48FF-8F27-9C2605A29F52';
+HAPCharacteristic_1.default.EveS2R2 = EveS2R2;
+class EveS2W1 extends HAPCharacteristic_1.default {
+    constructor() {
+        super('Eve-S2W1', EveS2W1.UUID, {
+            format: "data",
+            perms: ["pw", "hd"],
+        });
+    }
+}
+exports.EveS2W1 = EveS2W1;
+EveS2W1.UUID = 'E863F11C-079E-48FF-8F27-9C2605A29F52';
+HAPCharacteristic_1.default.EveS2W1 = EveS2W1;
+class EveS2W2 extends HAPCharacteristic_1.default {
+    constructor() {
+        super('Eve-S2W2', EveS2W2.UUID, {
+            format: "data",
+            perms: ["pw", "hd"],
+        });
+    }
+}
+exports.EveS2W2 = EveS2W2;
+EveS2W2.UUID = 'E863F121-079E-48FF-8F27-9C2605A29F52';
+HAPCharacteristic_1.default.EveS2W2 = EveS2W2;
+exports.default = EveCharacteristics;

package/build/lib/hap/eve-app/EveServices.d.ts

@@ -0,0 +1,5 @@
+import HAPService from '../HAPService';
+export declare class EveHistoryData extends HAPService {
+    static readonly UUID: string;
+    constructor();
+}

package/build/lib/hap/eve-app/EveServices.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EveHistoryData = void 0;
+const HAPCharacteristic_1 = __importDefault(require("../HAPCharacteristic"));
+const HAPService_1 = __importDefault(require("../HAPService"));
+class EveHistoryData extends HAPService_1.default {
+    constructor() {
+        super('EveHistoryData', EveHistoryData.UUID);
+        this.addCharacteristic(HAPCharacteristic_1.default.EveS2R1);
+        this.addCharacteristic(HAPCharacteristic_1.default.EveS2R2);
+        this.addCharacteristic(HAPCharacteristic_1.default.EveS2W1);
+        this.addCharacteristic(HAPCharacteristic_1.default.EveS2W2);
+    }
+}
+exports.EveHistoryData = EveHistoryData;
+EveHistoryData.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52';
+HAPService_1.default.EveHistoryData = EveHistoryData;

package/build/lib/types/HAPHostConfigType.d.ts

@@ -13,6 +13,8 @@ type HAPHostConfigType = NodeDef & {
     firmwareRev: SemVer;
     hardwareRev: SemVer;
     softwareRev: SemVer;
+    bind?: string;
+    bindType?: 'json' | 'str';
     customMdnsConfig: boolean;
     mdnsMulticast: boolean;
     mdnsInterface: string;

package/build/lib/types/HAPHostNodeType.d.ts

@@ -1,12 +1,11 @@
-/// <reference types="hap-nodejs/@types/bonjour-hap" />
-import { MulticastOptions } from 'bonjour-hap';
 import { Accessory, Categories } from 'hap-nodejs';
+import BonjourMulticastOptions from './hap-nodejs/BonjourMulticastOptions';
 import HAPHostConfigType from './HAPHostConfigType';
 import HostType from './HostType';
 import NodeType from './NodeType';
 type HAPHostNodeType = NodeType & {
     config: HAPHostConfigType;
-    mdnsConfig: MulticastOptions;
+    mdnsConfig: BonjourMulticastOptions;
     accessoryCategory: Categories;
     published: boolean;
     bridgeUsername: string;

package/build/lib/types/HAPServiceNodeType.d.ts

@@ -1,4 +1,4 @@
-import { Accessory, Characteristic, CharacteristicChange, CharacteristicGetCallback, CharacteristicProps, CharacteristicSetCallback, CharacteristicValue, Service } from 'hap-nodejs';
+import { Accessory, AdaptiveLightingController, Characteristic, CharacteristicChange, CharacteristicGetCallback, CharacteristicProps, CharacteristicSetCallback, CharacteristicValue, Service } from 'hap-nodejs';
 import { HAPConnection } from 'hap-nodejs/dist/lib/util/eventedhttp';
 import { NodeAPI } from 'node-red';
 import { NodeStatusUtils } from '../utils/NodeStatusUtils';
@@ -32,5 +32,6 @@ type HAPServiceNodeType = NodeType & {
     uniqueIdentifier: string;
     reachable?: boolean;
     nodeStatusUtils: NodeStatusUtils;
+    adaptiveLightingController?: AdaptiveLightingController;
 };
 export default HAPServiceNodeType;

package/build/lib/types/PublishTimersType.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 type PublishTimersType = {
     [key: string]: NodeJS.Timeout;
 };

package/build/lib/types/hap-nodejs/BonjourMulticastOptions.d.ts

@@ -0,0 +1,10 @@
+type BonjourMulticastOptions = {
+    multicast?: boolean;
+    interface?: string;
+    port?: number;
+    ip?: string;
+    ttl?: number;
+    loopback?: boolean;
+    reuseAddr?: boolean;
+};
+export default BonjourMulticastOptions;

package/build/lib/types/hap-nodejs/BonjourMulticastOptions.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/lib/utils/NodeStatusUtils.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node-red__registry" />
 import { NodeStatus } from '@node-red/registry';
 import NodeType from '../types/NodeType';
 type StatusType = 'NO_RESPONSE' | 'MSG';

package/build/lib/utils/ServiceUtils.js

@@ -1,8 +1,32 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const util = __importStar(require("node:util"));
 const logger_1 = require("@nrchkb/logger");
 const hap_nodejs_1 = require("hap-nodejs");
 const NRCHKBError_1 = __importDefault(require("../NRCHKBError"));
@@ -32,7 +56,7 @@ module.exports = function (node) {
     };
     const onCharacteristicGet = function (callback, context, connection) {
         var _a, _b;
-        log.debug(`onCharacteristicGet with status: ${this.statusCode}, value: ${this.value}, reachability is ${((_a = node.parentNode) !== null && _a !== void 0 ? _a : node).reachable} with context ${JSON.stringify(context)} on connection ${connection === null || connection === void 0 ? void 0 : connection.sessionID}`);
+        log.debug(`onCharacteristicGet with status: ${this.statusCode}, value: ${this.value}, reachability is ${((_a = node.parentNode) !== null && _a !== void 0 ? _a : node).reachable} with context ${util.inspect(context)} on connection ${connection === null || connection === void 0 ? void 0 : connection.sessionID}`);
         if (callback) {
             try {
                 callback(((_b = node.parentNode) !== null && _b !== void 0 ? _b : node).reachable
@@ -92,7 +116,7 @@ module.exports = function (node) {
     const onCharacteristicSet = (allCharacteristics) => function (newValue, callback, context, connection) {
         var _a, _b;
         log.debug(`onCharacteristicSet with status: ${this.statusCode}, value: ${this.value}, reachability is ${((_a = node.parentNode) !== null && _a !== void 0 ? _a : node).reachable} 
-            with context ${JSON.stringify(context)} on connection ${connection === null || connection === void 0 ? void 0 : connection.sessionID}`);
+            with context ${util.inspect(context)} on connection ${connection === null || connection === void 0 ? void 0 : connection.sessionID}`);
         try {
             if (callback) {
                 callback(((_b = node.parentNode) !== null && _b !== void 0 ? _b : node).reachable
@@ -110,7 +134,7 @@ module.exports = function (node) {
         var _a;
         const { oldValue, newValue, context, originator, reason } = change;
         log.debug(`onCharacteristicChange with reason: ${reason}, oldValue: ${oldValue}, newValue: ${newValue}, reachability is ${((_a = node.parentNode) !== null && _a !== void 0 ? _a : node).reachable} 
-            with context ${JSON.stringify(context)} on connection ${originator === null || originator === void 0 ? void 0 : originator.sessionID}`);
+            with context ${util.inspect(context)} on connection ${originator === null || originator === void 0 ? void 0 : originator.sessionID}`);
         if (oldValue != newValue) {
             onValueChange.call(this, allCharacteristics, 0, {
                 oldValue,
@@ -120,7 +144,8 @@ module.exports = function (node) {
         }
     };
     const onInput = function (msg) {
-        if (msg.hasOwnProperty('payload')) {
+        var _a, _b;
+        if (msg.payload) {
             const type = typeof msg.payload;
             if (type !== 'object') {
                 log.error(`Invalid payload type: ${type}`);
@@ -131,29 +156,39 @@ module.exports = function (node) {
             log.error('Invalid message (payload missing)');
             return;
         }
-        const topic = node.config.topic ? node.config.topic : node.name;
+        const topic = (_a = node.config.topic) !== null && _a !== void 0 ? _a : node.name;
         if (node.config.filter && msg.topic !== topic) {
             log.debug("msg.topic doesn't match configured value and filter is enabled. Dropping message.");
             return;
         }
         let context = null;
-        if (msg.payload.hasOwnProperty('Context')) {
+        if (msg.payload.Context) {
             context = msg.payload.Context;
             delete msg.payload.Context;
         }
-        node.topic_in = msg.topic ? msg.topic : '';
+        node.topic_in = (_b = msg.topic) !== null && _b !== void 0 ? _b : '';
         Object.keys(msg.payload).map((key) => {
-            var _a, _b;
+            var _a, _b, _c, _d;
             if (node.supported.indexOf(key) < 0) {
-                log.error(`Instead of '${key}' try one of these characteristics: '${node.supported.join("', '")}'`);
+                if (key === 'AdaptiveLightingController' &&
+                    node.adaptiveLightingController) {
+                    const value = (_a = msg.payload) === null || _a === void 0 ? void 0 : _a[key];
+                    const event = value === null || value === void 0 ? void 0 : value.event;
+                    if (event === 'disable') {
+                        (_b = node.adaptiveLightingController) === null || _b === void 0 ? void 0 : _b.disableAdaptiveLighting();
+                    }
+                }
+                else {
+                    log.error(`Instead of '${key}' try one of these characteristics: '${node.supported.join("', '")}'`);
+                }
             }
             else {
-                const value = (_a = msg.payload) === null || _a === void 0 ? void 0 : _a[key];
-                const parentNode = (_b = node.parentNode) !== null && _b !== void 0 ? _b : node;
+                const value = (_c = msg.payload) === null || _c === void 0 ? void 0 : _c[key];
+                const parentNode = (_d = node.parentNode) !== null && _d !== void 0 ? _d : node;
                 parentNode.reachable = value !== NO_RESPONSE_MSG;
                 const characteristic = node.service.getCharacteristic(Characteristic[key]);
                 if (context !== null) {
-                    characteristic.setValue(value, context);
+                    characteristic.setValue(value, undefined, context);
                 }
                 else {
                     characteristic.setValue(value);
@@ -184,7 +219,6 @@ module.exports = function (node) {
         done();
     };
     const getOrCreate = function (accessory, serviceInformation, parentService) {
-        var _a;
         const newService = new Service[serviceInformation.serviceName](serviceInformation.name, serviceInformation.UUID);
         log.debug(`Looking for service with UUID ${serviceInformation.UUID} ...`);
         let service = accessory.services.find((service) => {
@@ -203,21 +237,6 @@ module.exports = function (node) {
             }
             else {
                 service = accessory.addService(newService);
-                if (serviceInformation.serviceName === 'Lightbulb' &&
-                    serviceInformation.config.adaptiveLightingOptionsEnable) {
-                    try {
-                        const adaptiveLightingController = new hap_nodejs_1.AdaptiveLightingController(service, {
-                            controllerMode: (_a = serviceInformation.config
-                                .adaptiveLightingOptionsMode) !== null && _a !== void 0 ? _a : 1,
-                            customTemperatureAdjustment: serviceInformation.config
-                                .adaptiveLightingOptionsCustomTemperatureAdjustment,
-                        });
-                        accessory.configureController(adaptiveLightingController);
-                    }
-                    catch (error) {
-                        log.error(`Failed to configure adaptive lightning due to ${error}`);
-                    }
-                }
             }
         }
         else {
@@ -290,6 +309,59 @@ module.exports = function (node) {
             log.error('Invalid message (required {"payload":{"nrchkb":{"setup":{}}}})');
         }
     };
+    const configureAdaptiveLightning = () => {
+        if (node.service.UUID === Service.Lightbulb.UUID &&
+            node.config.adaptiveLightingOptionsEnable) {
+            try {
+                node.service.getCharacteristic(Characteristic.Brightness);
+                node.service.getCharacteristic(Characteristic.ColorTemperature);
+                const options = {
+                    controllerMode: node.config.adaptiveLightingOptionsMode
+                        ? +node.config.adaptiveLightingOptionsMode
+                        : 1,
+                    customTemperatureAdjustment: node.config
+                        .adaptiveLightingOptionsCustomTemperatureAdjustment
+                        ? +node.config
+                            .adaptiveLightingOptionsCustomTemperatureAdjustment
+                        : undefined,
+                };
+                log.trace(`Configuring Adaptive Lighting with options: ${options}`);
+                const adaptiveLightingController = new hap_nodejs_1.AdaptiveLightingController(node.service, options);
+                adaptiveLightingController.on('update', () => {
+                    const 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}`);
+            }
+        }
+    };
     return {
         getOrCreate,
         onCharacteristicGet,
@@ -299,5 +371,6 @@ module.exports = function (node) {
         onClose,
         waitForParent,
         handleWaitForSetup,
+        configureAdaptiveLightning,
     };
 };