node-red-contrib-homekit-bridged 1.7.0-dev.0 → 1.7.0-dev.2

package/build/lib/HAPHostNode.js

@@ -17,7 +17,7 @@ const hap_nodejs_1 = require("hap-nodejs");
 const semver_1 = require("semver");
 const preload_1 = __importDefault(require("semver/preload"));
 const NRCHKBError_1 = __importDefault(require("./NRCHKBError"));
-const HapCategories_1 = __importDefault(require("./types/HapCategories"));
+const HapCategories_1 = __importDefault(require("./types/hap-nodejs/HapCategories"));
 const HostType_1 = __importDefault(require("./types/HostType"));
 module.exports = (RED, hostType) => {
     const MdnsUtils = require('./utils/MdnsUtils')();

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/api.js

@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = require("@nrchkb/logger");
 const hap_nodejs_1 = require("hap-nodejs");
 const Storage_1 = require("./Storage");
-const HapCategories_1 = __importDefault(require("./types/HapCategories"));
+const HapCategories_1 = __importDefault(require("./types/hap-nodejs/HapCategories"));
 const version = require('../../package.json').version.trim();
 module.exports = function (RED) {
     const log = (0, logger_1.logger)('NRCHKB', 'API');

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

@@ -1,7 +1,7 @@
 import { MDNSAdvertiser } from 'hap-nodejs';
 import { NodeDef } from 'node-red';
 import { SemVer } from 'semver';
-import HapCategories from './HapCategories';
+import HapCategories from './hap-nodejs/HapCategories';
 type HAPHostConfigType = NodeDef & {
     bridgeName: string;
     pinCode: string;

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

@@ -1,23 +1,6 @@
 import { NodeDef } from 'node-red';
-import CameraConfigType from './CameraConfigType';
-type HAPService2ConfigType = NodeDef & {
-    isParent: boolean;
-    hostType: number;
-    bridge: string;
-    accessoryId: string;
-    parentService: string;
-    name: string;
-    serviceName: string;
-    topic: string;
-    filter: boolean;
-    manufacturer: string;
-    model: string;
-    serialNo: string;
-    firmwareRev?: string;
-    hardwareRev?: string;
-    softwareRev?: string;
-    characteristicProperties: string;
-    waitForSetupMsg: boolean;
+import HAPServiceConfigType from './HAPServiceConfigType';
+type HAPService2ConfigType = NodeDef & HAPServiceConfigType & {
     useEventCallback: boolean;
-} & CameraConfigType;
+};
 export default HAPService2ConfigType;

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

@@ -1,36 +1,7 @@
-import { Accessory, 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';
-import HAPHostNodeType from './HAPHostNodeType';
 import HAPService2ConfigType from './HAPService2ConfigType';
 import HAPServiceNodeType from './HAPServiceNodeType';
 import NodeType from './NodeType';
-import PublishTimersType from './PublishTimersType';
-type HAPService2NodeType = NodeType & {
+type HAPService2NodeType = NodeType & HAPServiceNodeType & {
     config: HAPService2ConfigType;
-    RED: NodeAPI;
-    setupDone: boolean;
-    configured: boolean;
-    handleWaitForSetup: (msg: any) => any;
-    onIdentify: (paired: boolean, callback: () => any) => void;
-    hostNode: HAPHostNodeType;
-    childNodes?: (HAPService2NodeType | HAPServiceNodeType)[];
-    service: Service;
-    parentService: Service;
-    parentNode?: HAPService2NodeType | HAPServiceNodeType;
-    accessory: Accessory;
-    characteristicProperties: {
-        [key: string]: CharacteristicProps;
-    };
-    supported: string[];
-    publishTimers: PublishTimersType;
-    topic_in: string;
-    onCharacteristicGet: (this: Characteristic, callback: CharacteristicGetCallback, context: any, connection?: HAPConnection) => void;
-    onCharacteristicSet: (this: Characteristic, newValue: CharacteristicValue, callback: CharacteristicSetCallback, context: any, connection?: HAPConnection) => void;
-    onCharacteristicChange: (this: Characteristic, change: CharacteristicChange) => void;
-    uniqueIdentifier: string;
-    reachable?: boolean;
-    nodeStatusUtils: NodeStatusUtils;
 };
 export default HAPService2NodeType;

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

@@ -1,3 +1,4 @@
+import { AdaptiveLightingControllerMode } from 'hap-nodejs/dist/lib/controller/AdaptiveLightingController';
 import { NodeDef } from 'node-red';
 import CameraConfigType from './CameraConfigType';
 type HAPServiceConfigType = NodeDef & {
@@ -18,5 +19,8 @@ type HAPServiceConfigType = NodeDef & {
     softwareRev?: string;
     characteristicProperties: string;
     waitForSetupMsg: boolean;
+    adaptiveLightingOptionsEnable?: boolean;
+    adaptiveLightingOptionsMode?: AdaptiveLightingControllerMode;
+    adaptiveLightingOptionsCustomTemperatureAdjustment?: number;
 } & CameraConfigType;
 export default HAPServiceConfigType;

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

@@ -0,0 +1,5 @@
+declare enum HapAdaptiveLightingControllerMode {
+    AUTOMATIC = 1,
+    MANUAL = 2
+}
+export default HapAdaptiveLightingControllerMode;

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

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var HapAdaptiveLightingControllerMode;
+(function (HapAdaptiveLightingControllerMode) {
+    HapAdaptiveLightingControllerMode[HapAdaptiveLightingControllerMode["AUTOMATIC"] = 1] = "AUTOMATIC";
+    HapAdaptiveLightingControllerMode[HapAdaptiveLightingControllerMode["MANUAL"] = 2] = "MANUAL";
+})(HapAdaptiveLightingControllerMode || (HapAdaptiveLightingControllerMode = {}));
+exports.default = HapAdaptiveLightingControllerMode;

package/build/lib/utils/ServiceUtils.js

@@ -120,7 +120,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 +132,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 +154,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);
@@ -274,6 +275,23 @@ module.exports = function (node) {
             log.error('Invalid message (required {"payload":{"nrchkb":{"setup":{}}}})');
         }
     };
+    const configureAdaptiveLightning = () => {
+        var _a;
+        if (node.service.name === 'Lightbulb' &&
+            node.config.adaptiveLightingOptionsEnable) {
+            try {
+                const adaptiveLightingController = new hap_nodejs_1.AdaptiveLightingController(node.service, {
+                    controllerMode: (_a = node.config.adaptiveLightingOptionsMode) !== null && _a !== void 0 ? _a : 1,
+                    customTemperatureAdjustment: node.config
+                        .adaptiveLightingOptionsCustomTemperatureAdjustment,
+                });
+                node.accessory.configureController(adaptiveLightingController);
+            }
+            catch (error) {
+                log.error(`Failed to configure adaptive lightning due to ${error}`);
+            }
+        }
+    };
     return {
         getOrCreate,
         onCharacteristicGet,
@@ -283,5 +301,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);
@@ -306,5 +307,6 @@ module.exports = function (node) {
         onClose,
         waitForParent,
         handleWaitForSetup,
+        configureAdaptiveLightning: ServiceUtilsLegacy.configureAdaptiveLightning,
     };
 };

package/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="0" selected="selected">AUTOMATIC</option>
+                <option value="1" 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">
+        </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,16 @@
             },
             outputs: {
                 value: 2,
-            }
+            },
+            adaptiveLightingOptionsEnable: {
+                value: false,
+            },
+            adaptiveLightingOptionsMode: {
+                value: 0,
+            },
+            adaptiveLightingOptionsCustomTemperatureAdjustment: {
+                value: undefined,
+            },
         },
         inputs: 1,
         outputs: 2,
@@ -581,6 +609,7 @@
             })
 
             let cameraConfiguration = $('#camera-configuration')
+            let adaptiveLightningConfiguration = $('#adaptive-lightning-configuration')
 
             selectServiceName
                 .find('option')
@@ -601,6 +630,16 @@
                 })
                 .change()
 
+            selectServiceName
+                .change(function () {
+                    if (this.value === 'Lightbulb') {
+                        adaptiveLightningConfiguration.fadeIn('fast')
+                    } else {
+                        adaptiveLightningConfiguration.fadeOut('fast')
+                    }
+                })
+                .change()
+
             $('#node-input-characteristicProperties').typedInput({
                 type: 'json',
                 types: ['json'],

package/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="0" selected="selected">AUTOMATIC</option>
+                <option value="1" 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">
+        </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,16 @@ if (nrchkbExperimental) {
             },
             outputs: {
                 value: 1,
-            }
+            },
+            adaptiveLightingOptionsEnable: {
+                value: false,
+            },
+            adaptiveLightingOptionsMode: {
+                value: 0,
+            },
+            adaptiveLightingOptionsCustomTemperatureAdjustment: {
+                value: undefined,
+            },
         },
         inputs: 1,
         outputs: 1,
@@ -583,6 +611,7 @@ if (nrchkbExperimental) {
             })
 
             let cameraConfiguration = $('#camera-configuration')
+            let adaptiveLightningConfiguration = $('#adaptive-lightning-configuration')
 
             selectServiceName
                 .find('option')
@@ -603,6 +632,16 @@ if (nrchkbExperimental) {
                 })
                 .change()
 
+            selectServiceName
+                .change(function () {
+                    if (this.value === 'Lightbulb') {
+                        adaptiveLightningConfiguration.fadeIn('fast')
+                    } else {
+                        adaptiveLightningConfiguration.fadeOut('fast')
+                    }
+                })
+                .change()
+
             $('#node-input-characteristicProperties').typedInput({
                 type: 'json',
                 types: ['json'],

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-homekit-bridged",
-    "version": "1.7.0-dev.0",
+    "version": "1.7.0-dev.2",
     "description": "Node-RED nodes to simulate Apple HomeKit devices.",
     "main": "build/nodes/nrchkb.js",
     "scripts": {
@@ -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",