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

package/build/lib/HAPServiceNode.js

@@ -161,6 +161,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

@@ -161,6 +161,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/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,17 +156,17 @@ 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;
             if (node.supported.indexOf(key) < 0) {
@@ -153,7 +178,7 @@ module.exports = function (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 +209,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 +227,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 +299,31 @@ 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);
+                node.accessory.configureController(adaptiveLightingController);
+            }
+            catch (error) {
+                log.error(`Failed to configure Adaptive Lightning due to ${error}`);
+            }
+        }
+    };
     return {
         getOrCreate,
         onCharacteristicGet,
@@ -299,5 +333,6 @@ module.exports = function (node) {
         onClose,
         waitForParent,
         handleWaitForSetup,
+        configureAdaptiveLightning,
     };
 };

package/build/lib/utils/ServiceUtils2.js

@@ -9,6 +9,7 @@ const NRCHKBError_1 = __importDefault(require("../NRCHKBError"));
 const Storage_1 = require("../Storage");
 module.exports = function (node) {
     const log = (0, logger_1.logger)('NRCHKB', 'ServiceUtils2', node.config.name, node);
+    const ServiceUtilsLegacy = require('./ServiceUtils')(node);
     const HapNodeJS = require('hap-nodejs');
     const Service = HapNodeJS.Service;
     const Characteristic = HapNodeJS.Characteristic;
@@ -127,7 +128,7 @@ module.exports = function (node) {
         }
     };
     const onInput = function (msg) {
-        var _a;
+        var _a, _b;
         if (msg.payload) {
             const type = typeof msg.payload;
             if (type !== 'object') {
@@ -139,7 +140,7 @@ 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;
@@ -149,7 +150,7 @@ module.exports = function (node) {
             context = msg.payload.Context;
             delete msg.payload.Context;
         }
-        node.topic_in = (_a = msg.topic) !== null && _a !== void 0 ? _a : '';
+        node.topic_in = (_b = msg.topic) !== null && _b !== void 0 ? _b : '';
         Object.keys(msg.payload).map((key) => {
             var _a, _b, _c;
             if (node.supported.indexOf(key) < 0) {
@@ -176,7 +177,7 @@ module.exports = function (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);
@@ -207,7 +208,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) => {
@@ -226,21 +226,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 {
@@ -322,5 +307,6 @@ module.exports = function (node) {
         onClose,
         waitForParent,
         handleWaitForSetup,
+        configureAdaptiveLightning: ServiceUtilsLegacy.configureAdaptiveLightning,
     };
 };

package/build/nodes/service.html

@@ -203,13 +203,13 @@
         <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="0" selected="selected">AUTOMATIC</option>
-                <option value="1">MANUAL</option>
+                <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="text" id="node-input-adaptiveLightingOptionsCustomTemperatureAdjustment">
+            <input type="number" id="node-input-adaptiveLightingOptionsCustomTemperatureAdjustment">
         </div>
     </div>
 
@@ -498,10 +498,12 @@
                 value: false,
             },
             adaptiveLightingOptionsMode: {
-                value: 0,
+                value: 1,
+                validate: RED.validators.number()
             },
             adaptiveLightingOptionsCustomTemperatureAdjustment: {
-                value: undefined,
+                value: 0,
+                validate: RED.validators.number()
             },
         },
         inputs: 1,

package/build/nodes/service2.html

@@ -203,13 +203,13 @@
         <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="0" selected="selected">AUTOMATIC</option>
-                <option value="1">MANUAL</option>
+                <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="text" id="node-input-adaptiveLightingOptionsCustomTemperatureAdjustment">
+            <input type="number" id="node-input-adaptiveLightingOptionsCustomTemperatureAdjustment">
         </div>
     </div>
 
@@ -508,10 +508,12 @@ if (nrchkbExperimental) {
                 value: false,
             },
             adaptiveLightingOptionsMode: {
-                value: 0,
+                value: 1,
+                validate: RED.validators.number()
             },
             adaptiveLightingOptionsCustomTemperatureAdjustment: {
-                value: undefined,
+                value: 0,
+                validate: RED.validators.number()
             },
         },
         inputs: 1,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-homekit-bridged",
-    "version": "1.7.0-dev.1",
+    "version": "1.7.0-dev.3",
     "description": "Node-RED nodes to simulate Apple HomeKit devices.",
     "main": "build/nodes/nrchkb.js",
     "scripts": {
@@ -42,7 +42,7 @@
     },
     "homepage": "https://github.com/NRCHKB/node-red-contrib-homekit-bridged#readme",
     "dependencies": {
-        "@nrchkb/logger": "^2.0.2",
+        "@nrchkb/logger": "^3.0.0",
         "hap-nodejs": "0.12.2",
         "node-persist": "^4.0.1",
         "semver": "^7.6.2",
@@ -50,7 +50,7 @@
     },
     "devDependencies": {
         "@homebridge/ciao": "^1.2.0",
-        "@node-red/registry": "^3.1.10",
+        "@node-red/registry": "^3.1.11",
         "@types/mocha": "^10.0.6",
         "@types/node": "^18",
         "@types/node-persist": "^3.1.8",
@@ -58,8 +58,8 @@
         "@types/node-red-node-test-helper": "^0.3.4",
         "@types/semver": "^7.5.8",
         "@types/uuid": "^9.0.8",
-        "@typescript-eslint/eslint-plugin": "^7.13.0",
-        "@typescript-eslint/parser": "^7.13.0",
+        "@typescript-eslint/eslint-plugin": "^7.13.1",
+        "@typescript-eslint/parser": "^7.13.1",
         "babel-eslint": "^10.1.0",
         "del-cli": "^5.1.0",
         "eslint": "^8",
@@ -68,7 +68,7 @@
         "eslint-plugin-simple-import-sort": "^12.1.0",
         "husky": "^9.0.11",
         "mocha": "^10.4.0",
-        "node-red": "^3.1.10",
+        "node-red": "^3.1.11",
         "node-red-node-test-helper": "^0.3.4",
         "prettier": "^3.3.2",
         "ts-node": "^10.9.2",