node-red-contrib-homekit-bridged 1.4.3 → 1.5.0-dev.3

package/CHANGELOG.md

@@ -11,6 +11,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.5.0-dev.2]
+
+### Fixed
+
+- Accessory could not be recovered from NO_RESPONSE using single Characteristic
+- Make unsupported Characteristic error more
+  descriptive [#456](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/456)
+
+### Changed
+
+- Updated hap-nodejs to [0.9.7](https://github.com/homebridge/HAP-NodeJS/releases/tag/v0.9.7) (bug fixes)
+
 ## [1.4.3]
 
 ### Added
@@ -19,7 +31,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Changed
 
-- Updated hap-nodejs to [0.9.6](https://github.com/homebridge/HAP-NodeJS/releases/tag/v0.9.6) (bug fixes and security fixes)
+- Updated hap-nodejs to [0.9.6](https://github.com/homebridge/HAP-NodeJS/releases/tag/v0.9.6) (bug fixes and security
+  fixes)
 
 ## [1.4.2]
 
@@ -56,7 +69,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Changed
 
-- Updated hap-nodejs to [0.9.5](https://github.com/homebridge/HAP-NodeJS/releases/tag/v0.9.5) (added new iOS 15 Services and Characteristics)
+- Updated hap-nodejs to [0.9.5](https://github.com/homebridge/HAP-NodeJS/releases/tag/v0.9.5) (added new iOS 15 Services
+  and Characteristics)
 - Updated dependencies to latest versions
 - Changed `BatteryService` to `Battery` in demo examples as `BatteryService` is deprecated #381 - thanks @crxporter
 - Readme rework - thanks @crxporter

package/build/lib/HAPServiceNode.js

@@ -74,6 +74,7 @@ module.exports = (RED) => {
             log.debug('Starting Parent Service');
             configure.call(self);
             self.configured = true;
+            self.reachable = true;
         }
         else {
             const serviceType = config.serviceName === 'CameraControl' ? 'Camera' : 'Linked';
@@ -115,14 +116,15 @@ module.exports = (RED) => {
                 log.error('Parent Node not assigned', false);
                 throw new NRCHKBError_1.default('Parent Node not assigned');
             }
-            self.parentService = parentNode.service;
+            self.parentNode = parentNode;
+            self.parentService = self.parentNode.service;
             if (!self.parentService) {
                 log.error('Parent Service not assigned', false);
                 throw new NRCHKBError_1.default('Parent Service not assigned');
             }
-            self.hostNode = parentNode.hostNode;
-            parentNode.childNodes.push(self);
-            self.accessory = parentNode.accessory;
+            self.hostNode = self.parentNode.hostNode;
+            self.parentNode.childNodes.push(self);
+            self.accessory = self.parentNode.accessory;
         }
         self.name = self.config.name;
         if (self.hasOwnProperty('_flow') &&

package/build/lib/HAPServiceNode2.js

@@ -74,6 +74,7 @@ module.exports = (RED) => {
             log.debug('Starting Parent Service');
             configure.call(self);
             self.configured = true;
+            self.reachable = true;
         }
         else {
             const serviceType = config.serviceName === 'CameraControl' ? 'Camera' : 'Linked';
@@ -115,14 +116,15 @@ module.exports = (RED) => {
                 log.error('Parent Node not assigned', false);
                 throw new NRCHKBError_1.default('Parent Node not assigned');
             }
-            self.parentService = parentNode.service;
+            self.parentNode = parentNode;
+            self.parentService = self.parentNode.service;
             if (!self.parentService) {
                 log.error('Parent Service not assigned', false);
                 throw new NRCHKBError_1.default('Parent Service not assigned');
             }
-            self.hostNode = parentNode.hostNode;
-            parentNode.childNodes.push(self);
-            self.accessory = parentNode.accessory;
+            self.hostNode = self.parentNode.hostNode;
+            self.parentNode.childNodes.push(self);
+            self.accessory = self.parentNode.accessory;
         }
         self.name = self.config.name;
         if (self.hasOwnProperty('_flow') &&

package/build/lib/api.js

@@ -141,6 +141,14 @@ module.exports = function (RED) {
         const characteristicNameToKey = (name) => {
             return name.replace(' ', '');
         };
+        const toNumber = (value, optional = undefined) => {
+            const num = Number(value);
+            if (isNaN(num)) {
+                return optional;
+            }
+            else
+                return num;
+        };
         const refreshCustomCharacteristics = (customCharacteristics) => {
             log.debug('Refreshing Custom Characteristics');
             const customCharacteristicKeys = [];
@@ -165,6 +173,15 @@ module.exports = function (RED) {
                     if (((_e = validatedProps.adminOnlyAccess) === null || _e === void 0 ? void 0 : _e.length) === 0) {
                         validatedProps.adminOnlyAccess = undefined;
                     }
+                    if (validatedProps.minValue) {
+                        validatedProps.minValue = toNumber(validatedProps.minValue);
+                    }
+                    if (validatedProps.maxValue) {
+                        validatedProps.maxValue = toNumber(validatedProps.maxValue);
+                    }
+                    if (validatedProps.minStep) {
+                        validatedProps.minStep = toNumber(validatedProps.minStep);
+                    }
                     class CustomCharacteristic extends hap_nodejs_1.Characteristic {
                         constructor() {
                             var _a;

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

@@ -18,6 +18,7 @@ declare type HAPService2NodeType = NodeType & {
     childNodes: (HAPService2NodeType | HAPServiceNodeType)[];
     service: Service;
     parentService: Service;
+    parentNode?: HAPService2NodeType | HAPServiceNodeType;
     accessory: Accessory;
     characteristicProperties: {
         [key: string]: CharacteristicProps;
@@ -29,5 +30,6 @@ declare type HAPService2NodeType = NodeType & {
     onCharacteristicSet: (this: Characteristic, newValue: CharacteristicValue, callback: CharacteristicSetCallback, context: any, connection?: HAPConnection) => void;
     onCharacteristicChange: (this: Characteristic, change: CharacteristicChange) => void;
     uniqueIdentifier: string;
+    reachable?: boolean;
 } & StatusUtilType;
 export default HAPService2NodeType;

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

@@ -18,6 +18,7 @@ declare type HAPServiceNodeType = NodeType & {
     childNodes: (HAPService2NodeType | HAPServiceNodeType)[];
     service: Service;
     parentService: Service;
+    parentNode?: HAPService2NodeType | HAPServiceNodeType;
     accessory: Accessory;
     characteristicProperties: {
         [key: string]: CharacteristicProps;
@@ -29,5 +30,6 @@ declare type HAPServiceNodeType = NodeType & {
     onCharacteristicSet: (this: Characteristic, newValue: CharacteristicValue, callback: CharacteristicSetCallback, context: any, connection?: HAPConnection) => void;
     onCharacteristicChange: (this: Characteristic, change: CharacteristicChange) => void;
     uniqueIdentifier: string;
+    reachable?: boolean;
 } & StatusUtilType;
 export default HAPServiceNodeType;

package/build/lib/utils/CharacteristicUtils.js

@@ -42,7 +42,7 @@ module.exports = function (node) {
                 characteristic.props.minValue = -100;
             }
         });
-        return supported;
+        return [...new Set(supported)];
     };
     return {
         load: load,

package/build/lib/utils/CharacteristicUtils2.js

@@ -42,7 +42,7 @@ module.exports = function (node) {
                 characteristic.props.minValue = -100;
             }
         });
-        return supported;
+        return [...new Set(supported)];
     };
     return {
         load: load,

package/build/lib/utils/ServiceUtils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const HostType_1 = __importDefault(require("../types/HostType"));
+const hap_nodejs_1 = require("hap-nodejs");
 const logger_1 = require("@nrchkb/logger");
 const NRCHKBError_1 = __importDefault(require("../NRCHKBError"));
 module.exports = function (node) {
@@ -31,12 +31,13 @@ module.exports = function (node) {
         return hap;
     };
     const onCharacteristicGet = function (callback, context, connection) {
-        log.debug(`onCharacteristicGet with status: ${this.statusCode}, value: ${this.value}, reachability is ${node.accessory.reachable} with context ${JSON.stringify(context)} on connection ${connection === null || connection === void 0 ? void 0 : connection.sessionID}`);
+        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}`);
         if (callback) {
             try {
-                callback(node.accessory.reachable
-                    ? this.statusCode
-                    : new Error(NO_RESPONSE_MSG), this.value);
+                callback(((_b = node.parentNode) !== null && _b !== void 0 ? _b : node).reachable
+                    ? null
+                    : new hap_nodejs_1.HapStatusError(-70402), this.value);
             }
             catch (_) { }
         }
@@ -76,13 +77,14 @@ module.exports = function (node) {
         }
     };
     const onCharacteristicSet = (allCharacteristics) => function (newValue, callback, context, connection) {
-        log.debug(`onCharacteristicSet with status: ${this.statusCode}, value: ${this.value}, reachability is ${node.accessory.reachable} 
+        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}`);
         try {
             if (callback) {
-                callback(node.accessory.reachable
+                callback(((_b = node.parentNode) !== null && _b !== void 0 ? _b : node).reachable
                     ? null
-                    : new Error(NO_RESPONSE_MSG));
+                    : new hap_nodejs_1.HapStatusError(-70402));
             }
         }
         catch (_) { }
@@ -92,8 +94,9 @@ module.exports = function (node) {
         }, connection);
     };
     const onCharacteristicChange = (allCharacteristics) => function (change) {
+        var _a;
         const { oldValue, newValue, context, originator, reason } = change;
-        log.debug(`onCharacteristicChange with reason: ${reason}, oldValue: ${oldValue}, newValue: ${newValue}, reachability is ${node.accessory.reachable} 
+        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}`);
         if (oldValue != newValue) {
             onValueChange.call(this, allCharacteristics, 0, {
@@ -127,22 +130,20 @@ module.exports = function (node) {
         }
         node.topic_in = msg.topic ? msg.topic : '';
         Object.keys(msg.payload).map((key) => {
+            var _a, _b;
             if (node.supported.indexOf(key) < 0) {
-                log.error(`Instead of ${key} try one of these characteristics: ${node.supported.join(', ')}`);
+                log.error(`Instead of '${key}' try one of these characteristics: '${node.supported.join("', '")}'`);
             }
             else {
-                if ((node.config.isParent &&
-                    node.config.hostType == HostType_1.default.BRIDGE) ||
-                    (!node.config.isParent &&
-                        node.hostNode.hostType == HostType_1.default.BRIDGE)) {
-                    node.accessory.updateReachability(msg.payload[key] !== NO_RESPONSE_MSG);
-                }
+                const value = (_a = msg.payload) === null || _a === void 0 ? void 0 : _a[key];
+                const parentNode = (_b = node.parentNode) !== null && _b !== void 0 ? _b : node;
+                parentNode.reachable = value !== NO_RESPONSE_MSG;
                 const characteristic = node.service.getCharacteristic(Characteristic[key]);
                 if (context !== null) {
-                    characteristic.setValue(msg.payload[key], undefined, context);
+                    characteristic.setValue(value, context);
                 }
                 else {
-                    characteristic.setValue(msg.payload[key]);
+                    characteristic.setValue(value);
                 }
             }
         });

package/build/lib/utils/ServiceUtils2.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const HostType_1 = __importDefault(require("../types/HostType"));
+const hap_nodejs_1 = require("hap-nodejs");
 const logger_1 = require("@nrchkb/logger");
 const Storage_1 = require("../Storage");
 const NRCHKBError_1 = __importDefault(require("../NRCHKBError"));
@@ -58,12 +58,13 @@ module.exports = function (node) {
         const characteristic = this;
         const oldValue = characteristic.value;
         const delayedCallback = (value) => {
+            var _a;
             const newValue = value !== null && value !== void 0 ? value : characteristic.value;
             if (callback) {
                 try {
-                    callback(node.accessory.reachable
-                        ? characteristic.statusCode
-                        : new Error(NO_RESPONSE_MSG), newValue);
+                    callback(((_a = node.parentNode) !== null && _a !== void 0 ? _a : node).reachable
+                        ? null
+                        : new hap_nodejs_1.HapStatusError(-70402), newValue);
                 }
                 catch (_) { }
             }
@@ -88,11 +89,12 @@ module.exports = function (node) {
         }
     };
     const onCharacteristicSet = (allCharacteristics) => function (newValue, callback, _context, connection) {
+        var _a;
         try {
             if (callback) {
-                callback(node.accessory.reachable
+                callback(((_a = node.parentNode) !== null && _a !== void 0 ? _a : node).reachable
                     ? null
-                    : new Error(NO_RESPONSE_MSG));
+                    : new hap_nodejs_1.HapStatusError(-70402));
             }
         }
         catch (_) { }
@@ -135,7 +137,7 @@ module.exports = function (node) {
         }
         node.topic_in = (_a = msg.topic) !== null && _a !== void 0 ? _a : '';
         Object.keys(msg.payload).map((key) => {
-            var _a, _b;
+            var _a, _b, _c;
             if (node.supported.indexOf(key) < 0) {
                 if (node.config.useEventCallback &&
                     Storage_1.Storage.uuid4Validate(key)) {
@@ -151,20 +153,16 @@ module.exports = function (node) {
                     }
                 }
                 else {
-                    log.error(`Instead of ${key} try one of these characteristics: ${node.supported.join(', ')}`);
+                    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];
-                if ((node.config.isParent &&
-                    node.config.hostType == HostType_1.default.BRIDGE) ||
-                    (!node.config.isParent &&
-                        node.hostNode.hostType == HostType_1.default.BRIDGE)) {
-                    node.accessory.updateReachability(value !== NO_RESPONSE_MSG);
-                }
+                const parentNode = (_c = node.parentNode) !== null && _c !== void 0 ? _c : node;
+                parentNode.reachable = value !== NO_RESPONSE_MSG;
                 const characteristic = node.service.getCharacteristic(Characteristic[key]);
                 if (context !== null) {
-                    characteristic.setValue(value, undefined, context);
+                    characteristic.setValue(value, context);
                 }
                 else {
                     characteristic.setValue(value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-homekit-bridged",
-  "version": "1.4.3",
+  "version": "1.5.0-dev.3",
   "description": "Node-RED nodes to simulate Apple HomeKit devices.",
   "main": "build/nodes/nrchkb.js",
   "scripts": {
@@ -18,11 +18,11 @@
   },
   "keywords": [
     "homekit",
-    "hap-nodejs",
     "node-red",
+    "NRCHKB",
     "iot",
     "home",
-    "NRCHKB",
+    "hap-nodejs",
     "homebridge"
   ],
   "node-red": {
@@ -33,11 +33,12 @@
       "service": "build/nodes/service.js",
       "service2": "build/nodes/service2.js",
       "status": "build/nodes/status.js"
-    }
+    },
+    "version": ">=1.3.7"
   },
   "author": {
     "name": "Tadeusz Wyrzykowski",
-    "email": "tadeusz@hey.com",
+    "email": "shaquu@icloud.com",
     "url": "https://github.com/Shaquu"
   },
   "license": "Apache-2.0",
@@ -47,34 +48,34 @@
   "homepage": "https://github.com/NRCHKB/node-red-contrib-homekit-bridged#readme",
   "dependencies": {
     "@nrchkb/logger": "^1.3.3",
-    "hap-nodejs": "^0.9.6",
+    "hap-nodejs": "~0.10.0",
     "node-persist": "^3.1.0",
     "semver": "^7.3.5",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@homebridge/ciao": "^1.1.2",
+    "@homebridge/ciao": "^1.1.3",
     "@node-red/registry": "^1.3.7",
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^10.17.50",
+    "@types/mocha": "^9.1.0",
+    "@types/node": "^10.17.60",
     "@types/node-persist": "^3.1.2",
-    "@types/node-red": "^1.1.1",
-    "@types/semver": "^7.3.8",
-    "@types/uuid": "^8.3.1",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
+    "@types/node-red": "^1.2.0",
+    "@types/semver": "^7.3.9",
+    "@types/uuid": "^8.3.4",
+    "@typescript-eslint/eslint-plugin": "^5.11.0",
+    "@typescript-eslint/parser": "^5.11.0",
     "babel-eslint": "^10.1.0",
-    "eslint": "^7.32.0",
+    "eslint": "^8.8.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "husky": "^7.0.2",
-    "mocha": "^9.1.2",
-    "node-red": "^1.3.7",
+    "husky": "^7.0.4",
+    "mocha": "^9.2.0",
+    "node-red": "1.3.7",
     "node-red-node-test-helper": "^0.2.7",
     "pinst": "^2.1.6",
-    "prettier": "^2.4.1",
-    "ts-node": "^10.2.1",
-    "typescript": "^4.4.3"
+    "prettier": "^2.5.1",
+    "ts-node": "^10.5.0",
+    "typescript": "^4.5.5"
   },
   "engines": {
     "node": ">=10.22.1"