node-red-contrib-homekit-bridged 1.7.0-dev.6 → 1.7.0-dev.8

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/utils/ServiceUtils.js

@@ -170,14 +170,17 @@ module.exports = function (node) {
         Object.keys(msg.payload).map((key) => {
             var _a, _b, _c, _d;
             if (node.supported.indexOf(key) < 0) {
-                if (key === 'AdaptiveLightingController') {
+                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();
                     }
                 }
-                log.error(`Instead of '${key}' try one of these characteristics: '${node.supported.join("', '")}'`);
+                else {
+                    log.error(`Instead of '${key}' try one of these characteristics: '${node.supported.join("', '")}'`);
+                }
             }
             else {
                 const value = (_c = msg.payload) === null || _c === void 0 ? void 0 : _c[key];

package/build/lib/utils/ServiceUtils2.js

@@ -152,7 +152,7 @@ module.exports = function (node) {
         }
         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)) {
@@ -167,13 +167,21 @@ 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) {

package/build/nodes/bridge.html

@@ -95,7 +95,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,7 +107,7 @@
         <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>Allow Message Passthrough</strong>: If you allow then message from node input will be sent to node output.</li>
         <li><strong>Custom MDNS Configuration</strong>: Check if you would like to use custom mdns configuration.</li>
         <ul>
             <li><strong>Multicast</strong>: Use udp multicasting. Optional. Default true.</li>
@@ -137,7 +137,7 @@
             },
             pinCode: {
                 required: true,
-                validate: pinCodeRegex,
+                validate: validatePinCode,
             },
             port: {
                 required: false,
@@ -229,7 +229,7 @@
             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)
             }

package/build/nodes/nrchkb.html

@@ -414,12 +414,38 @@
         return Math.floor(Math.random() * (max - min + 1) + min);
     }
 
+    const forbiddenPinCodes = [
+        '00000000',
+        '11111111',
+        '22222222',
+        '33333333',
+        '44444444',
+        '55555555',
+        '66666666',
+        '77777777',
+        '88888888',
+        '99999999',
+        '12345678',
+        '87654321'
+    ]
+
     const generatePinCode = function () {
         const [a, b, c, d, e, f, g, h] = Array.from({length: 9}, () => getRandomIntInclusive(0, 9));
+
+        if (forbiddenPinCodes.includes(`${a}${b}${c}${d}${e}${f}${g}${h}`)) {
+            return generatePinCode()
+        }
+
         return `${a}${b}${c}${d}-${e}${f}${g}${h}`
     }
 
-    const pinCodeRegex = RED.validators.regex(/([0-9]{3}-[0-9]{2}-[0-9]{3}|[0-9]{4}-[0-9]{4})/)
+    const validatePinCode = function (value) {
+        if (!RED.validators.regex(/([0-9]{3}-[0-9]{2}-[0-9]{3}|[0-9]{4}-[0-9]{4})/)) {
+            return false
+        }
+
+        return !forbiddenPinCodes.includes(value.replaceAll("-", ""));
+    }
 </script>
 
 <script data-template-name="nrchkb" type="text/x-red">

package/build/nodes/standalone.html

@@ -114,7 +114,7 @@
         <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>Allow Message Passthrough</strong>: If you allow then message from node input will be sent to node output.</li>
         <li><strong>Custom MDNS Configuration</strong>: Check if you would like to use custom mdns configuration.</li>
         <ul>
             <li><strong>Multicast</strong>: Use udp multicasting. Optional. Default true.</li>
@@ -146,7 +146,7 @@
             },
             pinCode: {
                 required: true,
-                validate: pinCodeRegex,
+                validate: validatePinCode,
             },
             port: {
                 required: false,
@@ -240,7 +240,7 @@
         oneditprepare: function () {
             const node = this
 
-            if (!pinCodeRegex(node.pinCode)) {
+            if (!validatePinCode(node.pinCode)) {
                 node.pinCode = generatePinCode()
                 $("#node-config-input-pinCode").val(node.pinCode)
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-homekit-bridged",
-    "version": "1.7.0-dev.6",
+    "version": "1.7.0-dev.8",
     "description": "Node-RED nodes to simulate Apple HomeKit devices.",
     "main": "build/nodes/nrchkb.js",
     "scripts": {
@@ -58,8 +58,8 @@
         "@types/node-red-node-test-helper": "^0.3.4",
         "@types/semver": "^7.5.8",
         "@types/uuid": "^10.0.0",
-        "@typescript-eslint/eslint-plugin": "^7.13.1",
-        "@typescript-eslint/parser": "^7.13.1",
+        "@typescript-eslint/eslint-plugin": "^7.14.1",
+        "@typescript-eslint/parser": "^7.14.1",
         "babel-eslint": "^10.1.0",
         "del-cli": "^5.1.0",
         "eslint": "^8",
@@ -67,7 +67,7 @@
         "eslint-plugin-prettier": "^5.1.3",
         "eslint-plugin-simple-import-sort": "^12.1.0",
         "husky": "^9.0.11",
-        "mocha": "^10.4.0",
+        "mocha": "^10.5.1",
         "node-red": "^4.0.0",
         "node-red-node-test-helper": "^0.3.4",
         "prettier": "^3.3.2",