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

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);
@@ -274,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,
@@ -283,5 +371,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,9 +150,9 @@ 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;
+            var _a, _b, _c, _d, _e;
             if (node.supported.indexOf(key) < 0) {
                 if (node.config.useEventCallback &&
                     Storage_1.Storage.uuid4Validate(key)) {
@@ -166,17 +167,25 @@ module.exports = function (node) {
                         log.error(`Callback ${callbackID} timeout`);
                     }
                 }
+                else if (key === 'AdaptiveLightingController' &&
+                    node.adaptiveLightingController) {
+                    const value = (_b = msg.payload) === null || _b === void 0 ? void 0 : _b[key];
+                    const event = value === null || value === void 0 ? void 0 : value.event;
+                    if (event === 'disable') {
+                        (_c = node.adaptiveLightingController) === null || _c === void 0 ? void 0 : _c.disableAdaptiveLighting();
+                    }
+                }
                 else {
                     log.error(`Instead of '${key}' try one of these characteristics: '${node.supported.join("', '")}'`);
                 }
             }
             else {
-                const value = (_b = msg.payload) === null || _b === void 0 ? void 0 : _b[key];
-                const parentNode = (_c = node.parentNode) !== null && _c !== void 0 ? _c : node;
+                const value = (_d = msg.payload) === null || _d === void 0 ? void 0 : _d[key];
+                const parentNode = (_e = node.parentNode) !== null && _e !== void 0 ? _e : 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 +315,6 @@ module.exports = function (node) {
         onClose,
         waitForParent,
         handleWaitForSetup,
+        configureAdaptiveLightning: ServiceUtilsLegacy.configureAdaptiveLightning,
     };
 };

package/build/nodes/bridge.html

@@ -55,9 +55,14 @@
         <label for="node-config-input-allowMessagePassthrough" style="width: 70%;">&nbsp;&nbsp;<i class="fa fa-step-forward"></i> Allow Message Passthrough</label>
     </div>
     <hr>
+    <div class="form-row">
+        <label for="node-config-input-bind"><i class="fa fa-filter"></i> Bind</label>
+        <input type="text" id="node-config-input-bind" placeholder="::">
+        <input type="hidden" id="node-config-input-bindType">
+    </div>
     <div class="form-row">
         <input type="checkbox" id="node-config-input-customMdnsConfig" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-config-input-customMdnsConfig" style="width: 70%;">&nbsp;&nbsp;<i class="fa fa-filter"></i> Custom MDNS Configuration</label>
+        <label for="node-config-input-customMdnsConfig" style="width: 70%;">&nbsp;&nbsp;<i class="fa fa-filter"></i> Custom MDNS Configuration (DEPRECATED, use Bind)</label>
     </div>
     <div id="mdns-configuration" style="display: none;">
         <div class="form-row">
@@ -95,7 +100,7 @@
 
 <script data-help-name="homekit-bridge" type="text/x-red">
     <h3 id="toc_4">Bridge</h3>
-    <p>The Bridge node is a configuration node, specifying the <em>bridge</em> that iOS sees, i.e. the device that is manually being added by the user. All accessories behind a bridge noded are then automatically added by iOS.
+    <p>The Bridge node is a configuration node, specifying the <em>bridge</em> that iOS sees, i.e. the device that is manually being added by the user. All accessories behind a bridge node are then automatically added by iOS.
     </p>
     <ul>
         <li><strong>Pin Code</strong>: Specify the Pin for the pairing process.</li>
@@ -107,8 +112,61 @@
         <li><strong>Hardware Revision</strong>: Should be a version number string in the form of <em>MAJOR.MINOR.REVISION</em> e.g. <em>1.2.0</em>. Other types of strings are ignored and won't be displayed.</li>
         <li><strong>Software Revision</strong>: Should be a version number string in the form of <em>MAJOR.MINOR.REVISION</em> e.g. <em>1.2.0</em>. Other types of strings are ignored and won't be displayed.</li>
         <li><strong>Name</strong>: If you intend to simulate a rocket, then why don&#39;t you call it <em>Rocket</em>. Name should be maximum 64 chars long and not contain <pre>.</pre></li>
-        <li><strong>Allow Message Passthrough</strong>: If you allow then message from node input will be send to node output.</li>
-        <li><strong>Custom MDNS Configuration</strong>: Check if you would like to use custom mdns configuration.</li>
+        <li><strong>Allow Message Passthrough</strong>: If you allow then message from node input will be sent to node output.</li>
+        <li><strong>Bind</strong>: Defines the host where the HAP server will be bound to. </li>
+        <ul>
+         <li>
+   Defines the host where the HAP server will be bound to.
+   When undefined the HAP server will bind to all available interfaces
+   (see https://nodejs.org/api/net.html#net_server_listen_port_host_backlog_callback).
+
+   This property accepts a mixture of IPAddresses and network interface names.
+   Depending on the mixture of supplied addresses/names hap-nodejs will bind differently.
+
+   It is advised to not just bind to a specific address, but specifying the interface name
+   in oder to bind on all address records (and ip version) available.
+
+   HAP-NodeJS (or the underlying ciao library) will not report about misspelled interface names,
+   as it could be that the interface is currently just down and will come up later.
+
+   Here are a few examples:
+    - bind: "::"
+        Pretty much identical to not specifying anything, as most systems (with ipv6 support)
+        will default to the unspecified ipv6 address (with dual stack support).
+
+    - bind: "0.0.0.0"
+        Binding TCP socket to the unspecified ipv4 address.
+        The mdns advertisement will exclude any ipv6 address records.
+
+    - bind: ["en0", "lo0"]
+        The mdns advertising will advertise all records of the en0 and loopback interface (if available) and
+        will also react to address changes on those interfaces.
+        In order for the HAP server to accept all those address records (which may contain ipv6 records)
+        it will bind on the unspecified ipv6 address "::" (assuming dual stack is supported).
+
+    - bind: ["en0", "lo0", "0.0.0.0"]
+        Same as above, only that the HAP server will bind on the unspecified ipv4 address "0.0.0.0".
+        The mdns advertisement will not advertise any ipv6 records.
+
+    - bind: "169.254.104.90"
+        This will bind the HAP server to the address 0.0.0.0.
+        The mdns advertisement will only advertise the A record 169.254.104.90.
+        If the given network interface of that address encounters an ip address change (to a different address),
+        the mdns advertisement will result in not advertising an address at all.
+        So it is advised to specify an interface name instead of a specific address.
+        This is identical with ipv6 addresses.
+
+    - bind: ["169.254.104.90", "192.168.1.4"]
+        As the HAP TCP socket can only bind to a single address, when specifying multiple ip addresses
+        the HAP server will bind to the unspecified ip address (0.0.0.0 if only ipv4 addresses are supplied,
+        :: if a mixture or only ipv6 addresses are supplied).
+        The mdns advertisement will only advertise the specified ip addresses.
+        If the given network interface of that address encounters an ip address change (to different addresses),
+        the mdns advertisement will result in not advertising an address at all.
+        So it is advised to specify an interface name instead of a specific address.
+         </li>
+        </ul>
+        <li><strong>Custom MDNS Configuration (DEPRECATED, use Bind)</strong>: Check if you would like to use custom mdns configuration.</li>
         <ul>
             <li><strong>Multicast</strong>: Use udp multicasting. Optional. Default true.</li>
             <li><strong>Multicast Interface IP:</strong>: Explicitly specify a network interface. Optional. Defaults to all.</li>
@@ -137,7 +195,7 @@
             },
             pinCode: {
                 required: true,
-                validate: pinCodeRegex,
+                validate: validatePinCode,
             },
             port: {
                 required: false,
@@ -185,37 +243,42 @@
                 required: false,
                 validate: versionValidator,
             },
+            bind: {
+                value: undefined,
+                required: false,
+            },
+            bindType: {
+                value: undefined,
+                required: false,
+            },
             customMdnsConfig: {
                 value: false,
                 required: false,
+                validate: (value) => !value
             },
             mdnsMulticast: {
                 value: true,
-                required: false,
+                required: false
             },
             mdnsInterface: {
-                required: false,
+                required: false
             },
             mdnsPort: {
-                required: false,
-                validate: function (value) {
-                    if (value) return RED.validators.port(value)
-                    else return true
-                },
+                required: false
             },
             mdnsIp: {
-                required: false,
+                required: false
             },
             mdnsTtl: {
-                required: false,
+                required: false
             },
             mdnsLoopback: {
                 value: true,
-                required: false,
+                required: false
             },
             mdnsReuseAddr: {
                 value: true,
-                required: false,
+                required: false
             },
             allowMessagePassthrough: {
                 value: true,
@@ -229,9 +292,9 @@
             return this.bridgeName ? 'node_label_italic' : ''
         },
         oneditprepare: function () {
-            if (!pinCodeRegex(this.pinCode)) {
+            if (!validatePinCode(this.pinCode)) {
                 this.pinCode = generatePinCode()
-                $("#node-config-input-pinCode").val(this.pinCode)
+                $('#node-config-input-pinCode').val(this.pinCode)
             }
 
             if (typeof this.allowMessagePassthrough == 'undefined') {
@@ -256,6 +319,12 @@
                     }
                 })
                 .change()
+
+            $('#node-config-input-bind').typedInput({
+                typeField: '#node-config-input-bindType',
+                default: 'str',
+                types: ['json', 'str']
+            })
         },
     })
 </script>