node-red-contrib-homekit-bridged 1.5.0-dev.9 → 1.5.0

package/build/lib/HAPHostNode.js

@@ -1,15 +1,24 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 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 preload_1 = __importDefault(require("semver/preload"));
+const logger_1 = require("@nrchkb/logger");
 const hap_nodejs_1 = require("hap-nodejs");
-const HapCategories_1 = __importDefault(require("./types/HapCategories"));
 const semver_1 = require("semver");
-const logger_1 = require("@nrchkb/logger");
+const preload_1 = __importDefault(require("semver/preload"));
 const NRCHKBError_1 = __importDefault(require("./NRCHKBError"));
+const HapCategories_1 = __importDefault(require("./types/HapCategories"));
+const HostType_1 = __importDefault(require("./types/HostType"));
 module.exports = (RED, hostType) => {
     const MdnsUtils = require('./utils/MdnsUtils')();
     const init = function (config) {
@@ -99,14 +108,18 @@ module.exports = (RED, hostType) => {
             return true;
         };
         self.on('close', function (removed, done) {
-            if (removed) {
-                self.host.destroy();
-            }
-            else {
-                self.host.unpublish();
+            return __awaiter(this, void 0, void 0, function* () {
+                if (removed) {
+                    log.debug('This node has been deleted');
+                    yield self.host.destroy();
+                }
+                else {
+                    log.debug('This node is being restarted');
+                    yield self.host.unpublish();
+                }
                 self.published = false;
-            }
-            done();
+                done();
+            });
         });
         self.host.on('identify', function (paired, callback) {
             if (paired) {

package/build/lib/HAPServiceNode.js

@@ -3,11 +3,12 @@ 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 FlowType_1 = require("./types/FlowType");
+const hap_nodejs_1 = require("hap-nodejs");
 const NRCHKBError_1 = __importDefault(require("./NRCHKBError"));
+const FlowType_1 = require("./types/FlowType");
+const HostType_1 = __importDefault(require("./types/HostType"));
+const NodeStatusUtils_1 = require("./utils/NodeStatusUtils");
 module.exports = (RED) => {
     const nrchkbConfigCompatibilityOverride = function () {
         const self = this;
@@ -23,17 +24,7 @@ module.exports = (RED) => {
     };
     const preInit = function (config) {
         const self = this;
-        self.lastStatusId = 0;
-        self.setStatus = (status) => {
-            self.status(status);
-            self.lastStatusId = new Date().getTime();
-            return self.lastStatusId;
-        };
-        self.clearStatus = (statusId) => {
-            if (statusId === self.lastStatusId) {
-                self.setStatus({});
-            }
-        };
+        self.nodeStatusUtils = new NodeStatusUtils_1.NodeStatusUtils(self);
         self.config = config;
         self.name = self.config.name;
         const log = (0, logger_1.logger)('NRCHKB', 'HAPServiceNode', self.config.name, self);
@@ -46,7 +37,7 @@ module.exports = (RED) => {
             if (self.config.waitForSetupMsg) {
                 log.debug('Waiting for Setup message. It should be of format {"payload":{"nrchkb":{"setup":{}}}}');
                 self.setupDone = false;
-                self.setStatus({
+                self.nodeStatusUtils.setStatus({
                     fill: 'blue',
                     shape: 'dot',
                     text: 'Waiting for Setup',
@@ -90,6 +81,7 @@ module.exports = (RED) => {
         }
     };
     const configure = function () {
+        var _a;
         const self = this;
         const log = (0, logger_1.logger)('NRCHKB', 'HAPServiceNode', self.config.name, self);
         const Utils = require('./utils')(self);
@@ -123,7 +115,7 @@ module.exports = (RED) => {
                 throw new NRCHKBError_1.default('Parent Service not assigned');
             }
             self.hostNode = self.parentNode.hostNode;
-            self.parentNode.childNodes.push(self);
+            (_a = self.parentNode.childNodes) === null || _a === void 0 ? void 0 : _a.push(self);
             self.accessory = self.parentNode.accessory;
         }
         self.name = self.config.name;
@@ -171,9 +163,9 @@ module.exports = (RED) => {
         }, self.parentService);
         self.characteristicProperties = CharacteristicUtils.load(self.service, self.config);
         if (self.config.isParent) {
-            self.publishTimers = BridgeUtils.delayedPublish(self);
+            BridgeUtils.delayedPublish(self);
         }
-        self.setStatus({
+        self.nodeStatusUtils.setStatus({
             fill: 'yellow',
             shape: 'ring',
             text: self.hostNode.config.pinCode,

package/build/lib/HAPServiceNode2.js

@@ -3,11 +3,12 @@ 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 FlowType_1 = require("./types/FlowType");
+const hap_nodejs_1 = require("hap-nodejs");
 const NRCHKBError_1 = __importDefault(require("./NRCHKBError"));
+const FlowType_1 = require("./types/FlowType");
+const HostType_1 = __importDefault(require("./types/HostType"));
+const NodeStatusUtils_1 = require("./utils/NodeStatusUtils");
 module.exports = (RED) => {
     const nrchkbConfigCompatibilityOverride = function () {
         const self = this;
@@ -23,17 +24,7 @@ module.exports = (RED) => {
     };
     const preInit = function (config) {
         const self = this;
-        self.lastStatusId = 0;
-        self.setStatus = (status) => {
-            self.status(status);
-            self.lastStatusId = new Date().getTime();
-            return self.lastStatusId;
-        };
-        self.clearStatus = (statusId) => {
-            if (statusId === self.lastStatusId) {
-                self.setStatus({});
-            }
-        };
+        self.nodeStatusUtils = new NodeStatusUtils_1.NodeStatusUtils(self);
         self.config = config;
         self.name = self.config.name;
         const log = (0, logger_1.logger)('NRCHKB', 'HAPServiceNode2', self.config.name, self);
@@ -46,7 +37,7 @@ module.exports = (RED) => {
             if (self.config.waitForSetupMsg) {
                 log.debug('Waiting for Setup message. It should be of format {"payload":{"nrchkb":{"setup":{}}}}');
                 self.setupDone = false;
-                self.setStatus({
+                self.nodeStatusUtils.setStatus({
                     fill: 'blue',
                     shape: 'dot',
                     text: 'Waiting for Setup',
@@ -90,6 +81,7 @@ module.exports = (RED) => {
         }
     };
     const configure = function () {
+        var _a;
         const self = this;
         const log = (0, logger_1.logger)('NRCHKB', 'HAPServiceNode2', self.config.name, self);
         const Utils = require('./utils')(self);
@@ -123,7 +115,7 @@ module.exports = (RED) => {
                 throw new NRCHKBError_1.default('Parent Service not assigned');
             }
             self.hostNode = self.parentNode.hostNode;
-            self.parentNode.childNodes.push(self);
+            (_a = self.parentNode.childNodes) === null || _a === void 0 ? void 0 : _a.push(self);
             self.accessory = self.parentNode.accessory;
         }
         self.name = self.config.name;
@@ -173,7 +165,7 @@ module.exports = (RED) => {
         if (self.config.isParent) {
             BridgeUtils.delayedPublish(self);
         }
-        self.setStatus({
+        self.nodeStatusUtils.setStatus({
             fill: 'yellow',
             shape: 'ring',
             text: self.hostNode.config.pinCode,

package/build/lib/Storage.d.ts

@@ -1,8 +1,8 @@
-import storage, { InitOptions } from 'node-persist';
-import { StorageType } from './types/storage/StorageType';
 import { CharacteristicEventTypes, SerializedAccessory, SerializedService } from 'hap-nodejs';
+import storage, { InitOptions } from 'node-persist';
 import { SerializedHostType } from './types/storage/SerializedHostType';
-declare type EventCallback = {
+import { StorageType } from './types/storage/StorageType';
+type EventCallback = {
     event: CharacteristicEventTypes;
     callback: (value?: any) => void;
 };

package/build/lib/Storage.js

@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Storage = void 0;
-const path_1 = __importDefault(require("path"));
-const node_persist_1 = __importDefault(require("node-persist"));
-const StorageType_1 = require("./types/storage/StorageType");
 const logger_1 = require("@nrchkb/logger");
+const node_persist_1 = __importDefault(require("node-persist"));
+const path_1 = __importDefault(require("path"));
 const uuid_1 = require("uuid");
 const NRCHKBError_1 = __importDefault(require("./NRCHKBError"));
+const StorageType_1 = require("./types/storage/StorageType");
 class Storage {
     static storagePath() {
         if (!Storage.storageInitialized) {

package/build/lib/api.js

@@ -23,15 +23,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const HapCategories_1 = __importDefault(require("./types/HapCategories"));
-const hap_nodejs_1 = require("hap-nodejs");
 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 version = require('../../package.json').version.trim();
 module.exports = function (RED) {
     const log = (0, logger_1.logger)('NRCHKB', 'API');
     const _initServiceAPI = () => {
-        log.debug('Initialize ServiceAPI');
+        log.debug('Initialize Service API');
         const serviceData = {
             BatteryService: {
                 nrchkbDisabledText: 'BatteryService (deprecated, replaced by Battery)',
@@ -42,6 +42,9 @@ module.exports = function (RED) {
             BridgingState: {
                 nrchkbDisabledText: 'BridgingState (deprecated, unused)',
             },
+            CameraEventRecordingManagement: {
+                nrchkbDisabledText: 'CameraEventRecordingManagement (deprecated, replaced by CameraRecordingManagement)',
+            },
             Relay: {
                 nrchkbDisabledText: 'Relay (deprecated, replaced by CloudRelay)',
             },
@@ -69,9 +72,7 @@ module.exports = function (RED) {
             res.json(serviceData);
         });
     };
-    const _initNRCHKBInfoAPI = () => {
-        log.debug('Initialize NRCHKB Info API');
-        log.debug(`Running version: ${version}`);
+    const stringifyVersion = (version) => {
         const releaseVersionRegex = /(\d+)\.(\d+)\.(\d+)/;
         const devVersionRegex = /(\d+)\.(\d+)\.(\d+)-dev\.(\d+)/;
         const releaseVersionFound = releaseVersionRegex.test(version);
@@ -109,6 +110,12 @@ module.exports = function (RED) {
             log.debug('Bad version format');
             xyzVersion = '0.0.0';
         }
+        return xyzVersion;
+    };
+    const _initNRCHKBInfoAPI = () => {
+        log.debug('Initialize NRCHKB Info API');
+        log.debug(`Running version: ${version}`);
+        const xyzVersion = stringifyVersion(version);
         log.debug(`Evaluated as: ${xyzVersion}`);
         const experimental = process.env.NRCHKB_EXPERIMENTAL === 'true';
         log.debug(`Running experimental: ${experimental}`);
@@ -123,7 +130,7 @@ module.exports = function (RED) {
         const getCustomCharacteristics = () => {
             return Storage_1.Storage.loadCustomCharacteristics()
                 .then((value) => {
-                log.trace(`loadCustomCharacteristics()`);
+                log.trace('loadCustomCharacteristics()');
                 log.trace(value);
                 if (Array.isArray(value)) {
                     return value;
@@ -221,7 +228,8 @@ module.exports = function (RED) {
                 isRedInitialized();
             }).then(() => {
                 RED.nodes.eachNode((node) => {
-                    if (node.type === 'homekit-service') {
+                    if (node.type === 'homekit-service' ||
+                        node.type === 'homekit-service2') {
                         const serviceNodeConfig = node;
                         const serviceNode = RED.nodes.getNode(serviceNodeConfig.id);
                         if (serviceNode &&
@@ -265,7 +273,7 @@ module.exports = function (RED) {
         }));
     });
     const _initAccessoryAPI = function () {
-        log.debug('Initialize AccessoryAPI');
+        log.debug('Initialize Accessory API');
         const accessoryCategoriesData = {};
         Object.keys(HapCategories_1.default)
             .sort()
@@ -288,5 +296,6 @@ module.exports = function (RED) {
     };
     return {
         init,
+        stringifyVersion,
     };
 };

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

@@ -1,4 +1,4 @@
-declare type AccessoryInformationType = {
+type AccessoryInformationType = {
     UUID: string;
     name: string;
     manufacturer: string;

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

@@ -1,4 +1,4 @@
-declare type CameraConfigType = {
+type CameraConfigType = {
     cameraConfigVideoProcessor: string;
     cameraConfigSource: string;
     cameraConfigStillImageSource?: string;

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

@@ -1,5 +1,5 @@
 import { CharacteristicProps } from 'hap-nodejs';
-declare type CustomCharacteristicType = CharacteristicProps & {
+type CustomCharacteristicType = CharacteristicProps & {
     UUID?: string;
     name?: string;
 };

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

@@ -2,7 +2,7 @@ declare enum FlowTypeType {
     Subflow = "subflow",
     Flow = "flow"
 }
-declare type FlowType = {
+type FlowType = {
     TYPE: FlowTypeType;
     path: string;
 };

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

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

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

@@ -1,9 +1,9 @@
-import NodeType from './NodeType';
-import HAPHostConfigType from './HAPHostConfigType';
+import { MulticastOptions } from 'bonjour-hap';
 import { Accessory, Categories } from 'hap-nodejs';
+import HAPHostConfigType from './HAPHostConfigType';
 import HostType from './HostType';
-import { MulticastOptions } from 'bonjour-hap';
-declare type HAPHostNodeType = NodeType & {
+import NodeType from './NodeType';
+type HAPHostNodeType = NodeType & {
     config: HAPHostConfigType;
     mdnsConfig: MulticastOptions;
     accessoryCategory: Categories;

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

@@ -1,6 +1,6 @@
 import { NodeDef } from 'node-red';
 import CameraConfigType from './CameraConfigType';
-declare type HAPService2ConfigType = NodeDef & {
+type HAPService2ConfigType = NodeDef & {
     isParent: boolean;
     hostType: number;
     bridge: string;

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

@@ -1,13 +1,13 @@
-import NodeType from './NodeType';
-import { NodeAPI } from 'node-red';
-import HAPService2ConfigType from './HAPService2ConfigType';
 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 PublishTimersType from './PublishTimersType';
-import StatusUtilType from './StatusUtilType';
+import HAPService2ConfigType from './HAPService2ConfigType';
 import HAPServiceNodeType from './HAPServiceNodeType';
-import { HAPConnection } from 'hap-nodejs/dist/lib/util/eventedhttp';
-declare type HAPService2NodeType = NodeType & {
+import NodeType from './NodeType';
+import PublishTimersType from './PublishTimersType';
+type HAPService2NodeType = NodeType & {
     config: HAPService2ConfigType;
     RED: NodeAPI;
     setupDone: boolean;
@@ -15,7 +15,7 @@ declare type HAPService2NodeType = NodeType & {
     handleWaitForSetup: (msg: any) => any;
     onIdentify: (paired: boolean, callback: () => any) => void;
     hostNode: HAPHostNodeType;
-    childNodes: (HAPService2NodeType | HAPServiceNodeType)[];
+    childNodes?: (HAPService2NodeType | HAPServiceNodeType)[];
     service: Service;
     parentService: Service;
     parentNode?: HAPService2NodeType | HAPServiceNodeType;
@@ -31,5 +31,6 @@ declare type HAPService2NodeType = NodeType & {
     onCharacteristicChange: (this: Characteristic, change: CharacteristicChange) => void;
     uniqueIdentifier: string;
     reachable?: boolean;
-} & StatusUtilType;
+    nodeStatusUtils: NodeStatusUtils;
+};
 export default HAPService2NodeType;

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

@@ -1,6 +1,6 @@
 import { NodeDef } from 'node-red';
 import CameraConfigType from './CameraConfigType';
-declare type HAPServiceConfigType = NodeDef & {
+type HAPServiceConfigType = NodeDef & {
     isParent: boolean;
     hostType: number;
     bridge: string;

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

@@ -1,13 +1,13 @@
-import NodeType from './NodeType';
-import { NodeAPI } from 'node-red';
 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 PublishTimersType from './PublishTimersType';
-import StatusUtilType from './StatusUtilType';
-import HAPServiceConfigType from './HAPServiceConfigType';
 import HAPService2NodeType from './HAPService2NodeType';
-import { HAPConnection } from 'hap-nodejs/dist/lib/util/eventedhttp';
-declare type HAPServiceNodeType = NodeType & {
+import HAPServiceConfigType from './HAPServiceConfigType';
+import NodeType from './NodeType';
+import PublishTimersType from './PublishTimersType';
+type HAPServiceNodeType = NodeType & {
     config: HAPServiceConfigType;
     RED: NodeAPI;
     setupDone: boolean;
@@ -15,7 +15,7 @@ declare type HAPServiceNodeType = NodeType & {
     handleWaitForSetup: (msg: any) => any;
     onIdentify: (paired: boolean, callback: () => any) => void;
     hostNode: HAPHostNodeType;
-    childNodes: (HAPService2NodeType | HAPServiceNodeType)[];
+    childNodes?: (HAPService2NodeType | HAPServiceNodeType)[];
     service: Service;
     parentService: Service;
     parentNode?: HAPService2NodeType | HAPServiceNodeType;
@@ -31,5 +31,6 @@ declare type HAPServiceNodeType = NodeType & {
     onCharacteristicChange: (this: Characteristic, change: CharacteristicChange) => void;
     uniqueIdentifier: string;
     reachable?: boolean;
-} & StatusUtilType;
+    nodeStatusUtils: NodeStatusUtils;
+};
 export default HAPServiceNodeType;

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

@@ -1,5 +1,5 @@
 import { NodeDef } from 'node-red';
-declare type HAPStatusConfigType = NodeDef & {
+type HAPStatusConfigType = NodeDef & {
     serviceNodeId: string;
 };
 export default HAPStatusConfigType;

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

@@ -1,11 +1,12 @@
-import NodeType from './NodeType';
 import { NodeAPI } from 'node-red';
-import StatusUtilType from './StatusUtilType';
+import { NodeStatusUtils } from '../utils/NodeStatusUtils';
 import HAPServiceNodeType from './HAPServiceNodeType';
 import HAPStatusConfigType from './HAPStatusConfigType';
-declare type HAPStatusNodeType = NodeType & {
+import NodeType from './NodeType';
+type HAPStatusNodeType = NodeType & {
     config: HAPStatusConfigType;
     RED: NodeAPI;
     serviceNode?: HAPServiceNodeType;
-} & StatusUtilType;
+    nodeStatusUtils: NodeStatusUtils;
+};
 export default HAPStatusNodeType;

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

@@ -1,6 +1,6 @@
 import { Node } from 'node-red';
 import { FlowType } from './FlowType';
-declare type NodeType = Node & {
+type NodeType = Node & {
     _flow: FlowType;
     _alias: string;
 };

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

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-declare type PublishTimersType = {
+type PublishTimersType = {
     [key: string]: NodeJS.Timeout;
 };
 export default PublishTimersType;

package/build/lib/types/storage/SerializedHostType.d.ts

@@ -1,5 +1,5 @@
 import { SerializedAccessory } from 'hap-nodejs';
-declare type SerializedHostType = {
+type SerializedHostType = {
     _isBridge: boolean;
 } & SerializedAccessory;
 export { SerializedHostType };

package/build/lib/utils/AccessoryUtils.js

@@ -77,13 +77,14 @@ module.exports = function (node) {
         return accessory;
     };
     const onIdentify = function (paired, callback) {
+        var _a;
         if (paired) {
             log.debug(`Identify called on paired Accessory ${node.accessory.displayName}`);
         }
         else {
             log.debug(`Identify called on unpaired Accessory ${node.accessory.displayName}`);
         }
-        const nodes = node.childNodes;
+        const nodes = (_a = node.childNodes) !== null && _a !== void 0 ? _a : [];
         for (let i = 0, len = nodes.length; i < len; i++) {
             const topic = nodes[i].config.topic
                 ? nodes[i].config.topic
@@ -93,13 +94,13 @@ module.exports = function (node) {
                 name: nodes[i].name,
                 topic: topic,
             };
-            const statusId = nodes[i].setStatus({
+            const statusId = nodes[i].nodeStatusUtils.setStatus({
                 fill: 'yellow',
                 shape: 'dot',
                 text: 'Identify : 1',
             });
             setTimeout(function () {
-                nodes[i].clearStatus(statusId);
+                nodes[i].nodeStatusUtils.clearStatus(statusId);
             }, 3000);
             nodes[i].send([msg, msg]);
         }

package/build/lib/utils/BridgeUtils.js

@@ -3,8 +3,8 @@ 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 logger_1 = require("@nrchkb/logger");
+const HostType_1 = __importDefault(require("../types/HostType"));
 module.exports = function () {
     const delayedPublish = function (node) {
         const log = (0, logger_1.logger)('NRCHKB', 'BridgeUtils', node.config.name, node);
@@ -29,7 +29,7 @@ module.exports = function () {
                 }
                 catch (error) {
                     log.error(`${hostTypeName} publish failed due to ${error}`);
-                    node.setStatus({
+                    node.nodeStatusUtils.setStatus({
                         fill: 'red',
                         shape: 'ring',
                         text: 'Error while publishing ' + hostTypeName,

package/build/lib/utils/CharacteristicUtils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const hap_nodejs_1 = require("hap-nodejs");
 const logger_1 = require("@nrchkb/logger");
+const hap_nodejs_1 = require("hap-nodejs");
 module.exports = function (node) {
     const log = (0, logger_1.logger)('NRCHKB', 'CharacteristicUtils', node.config.name, node);
     const ServiceUtils = require('./ServiceUtils')(node);

package/build/lib/utils/CharacteristicUtils2.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const hap_nodejs_1 = require("hap-nodejs");
 const logger_1 = require("@nrchkb/logger");
+const hap_nodejs_1 = require("hap-nodejs");
 module.exports = function (node) {
     const log = (0, logger_1.logger)('NRCHKB', 'CharacteristicUtils', node.config.name, node);
     const ServiceUtils = require('./ServiceUtils2')(node);

package/build/lib/utils/NodeStatusUtils.d.ts

@@ -0,0 +1,18 @@
+/// <reference types="node-red__registry" />
+import { NodeStatus } from '@node-red/registry';
+import NodeType from '../types/NodeType';
+type StatusType = 'NO_RESPONSE' | 'MSG';
+type NodeStatusWithType = NodeStatus & {
+    type?: StatusType;
+};
+type Status = string | NodeStatusWithType;
+export declare class NodeStatusUtils {
+    private node;
+    protected lastStatusId?: number;
+    protected lastStatusType?: StatusType;
+    constructor(node: Pick<NodeType, 'status'>);
+    setStatus(status: Status, timeout?: number): number;
+    clearStatusByType(type: StatusType): void;
+    clearStatus(statusId?: number, timeout?: number): void;
+}
+export {};

package/build/lib/utils/NodeStatusUtils.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NodeStatusUtils = void 0;
+const DEFAULT_STATUS_TYPE = 'MSG';
+class NodeStatusUtils {
+    constructor(node) {
+        this.node = node;
+    }
+    setStatus(status, timeout) {
+        var _a;
+        this.node.status(status);
+        const newStatusId = new Date().getTime();
+        this.lastStatusId = newStatusId;
+        if (typeof status !== 'string') {
+            this.lastStatusType = (_a = status.type) !== null && _a !== void 0 ? _a : DEFAULT_STATUS_TYPE;
+        }
+        else {
+            this.lastStatusType = DEFAULT_STATUS_TYPE;
+        }
+        if (timeout) {
+            this.clearStatus(newStatusId, timeout);
+        }
+        return newStatusId;
+    }
+    clearStatusByType(type) {
+        if (this.lastStatusType === type) {
+            this.clearStatus();
+        }
+    }
+    clearStatus(statusId, timeout) {
+        if (statusId !== undefined) {
+            if (statusId === this.lastStatusId) {
+                if (timeout) {
+                    setTimeout(function (nodeStatusUtil) {
+                        nodeStatusUtil.clearStatus(statusId);
+                    }, timeout, this);
+                }
+                else {
+                    this.setStatus('');
+                }
+            }
+        }
+        else {
+            this.setStatus('');
+        }
+    }
+}
+exports.NodeStatusUtils = NodeStatusUtils;

package/build/lib/utils/ServiceUtils.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const hap_nodejs_1 = require("hap-nodejs");
 const logger_1 = require("@nrchkb/logger");
+const hap_nodejs_1 = require("hap-nodejs");
 const NRCHKBError_1 = __importDefault(require("../NRCHKBError"));
 module.exports = function (node) {
     const log = (0, logger_1.logger)('NRCHKB', 'ServiceUtils', node.config.name, node);
@@ -43,6 +43,7 @@ module.exports = function (node) {
         }
     };
     const onValueChange = function (allCharacteristics, outputNumber, { oldValue, newValue, context }, connection) {
+        var _a, _b, _c, _d, _e;
         const topic = node.config.topic ? node.config.topic : node.topic_in;
         const msg = { payload: {}, hap: {}, name: node.name, topic: topic };
         const key = this.constructor.name;
@@ -56,15 +57,26 @@ module.exports = function (node) {
         if (oldValue !== undefined) {
             msg.hap.oldValue = oldValue;
         }
-        msg.hap.newValue = newValue;
-        const statusId = node.setStatus({
-            fill: 'yellow',
-            shape: 'dot',
-            text: key + ': ' + newValue,
-        });
-        setTimeout(function () {
-            node.clearStatus(statusId);
-        }, 3000);
+        msg.hap.reachable = (_a = node.reachable) !== null && _a !== void 0 ? _a : (_b = node.parentNode) === null || _b === void 0 ? void 0 : _b.reachable;
+        if (msg.hap.reachable === false) {
+            ;
+            [node, ...((_c = node.childNodes) !== null && _c !== void 0 ? _c : [])].forEach((n) => n.nodeStatusUtils.setStatus({
+                fill: 'red',
+                shape: 'ring',
+                text: 'Not reachable',
+                type: 'NO_RESPONSE',
+            }));
+        }
+        else {
+            msg.hap.newValue = newValue;
+            node.nodeStatusUtils.setStatus({
+                fill: 'yellow',
+                shape: 'dot',
+                text: key + ': ' + newValue,
+            }, 3000);
+            (_d = node.childNodes) === null || _d === void 0 ? void 0 : _d.forEach((n) => n.nodeStatusUtils.clearStatusByType('NO_RESPONSE'));
+            (_e = node.parentNode) === null || _e === void 0 ? void 0 : _e.nodeStatusUtils.clearStatusByType('NO_RESPONSE');
+        }
         log.debug(`${node.name} received ${key} : ${newValue}`);
         if (connection ||
             context ||
@@ -226,7 +238,7 @@ module.exports = function (node) {
     const waitForParent = () => {
         log.debug('Waiting for Parent Service');
         return new Promise((resolve) => {
-            node.setStatus({
+            node.nodeStatusUtils.setStatus({
                 fill: 'blue',
                 shape: 'dot',
                 text: 'Waiting for Parent Service',

package/build/lib/utils/ServiceUtils2.js

@@ -3,10 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const hap_nodejs_1 = require("hap-nodejs");
 const logger_1 = require("@nrchkb/logger");
-const Storage_1 = require("../Storage");
+const hap_nodejs_1 = require("hap-nodejs");
 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 HapNodeJS = require('hap-nodejs');
@@ -15,6 +15,7 @@ module.exports = function (node) {
     const CameraSource = require('../cameraSource').Camera;
     const NO_RESPONSE_MSG = 'NO_RESPONSE';
     const output = function (allCharacteristics, event, { oldValue, newValue }, connection) {
+        var _a, _b, _c, _d, _e;
         const eventObject = typeof event === 'object' ? event : { name: event };
         log.debug(`${eventObject.name} event, oldValue: ${oldValue}, newValue: ${newValue}, connection ${connection === null || connection === void 0 ? void 0 : connection.sessionID}`);
         const msg = {
@@ -23,18 +24,35 @@ module.exports = function (node) {
         };
         msg.payload = {};
         msg.hap = {
-            newValue,
             event: eventObject,
             allChars: allCharacteristics.reduce((allChars, singleChar) => {
                 const cKey = singleChar.constructor.name;
                 allChars[cKey] = singleChar.value;
                 return allChars;
             }, {}),
+            oldValue,
         };
-        if (oldValue !== undefined) {
-            msg.hap.oldValue = oldValue;
-        }
         const key = this.constructor.name;
+        msg.hap.reachable = (_a = node.reachable) !== null && _a !== void 0 ? _a : (_b = node.parentNode) === null || _b === void 0 ? void 0 : _b.reachable;
+        if (msg.hap.reachable === false) {
+            ;
+            [node, ...((_c = node.childNodes) !== null && _c !== void 0 ? _c : [])].forEach((n) => n.nodeStatusUtils.setStatus({
+                fill: 'red',
+                shape: 'ring',
+                text: 'Not reachable',
+                type: 'NO_RESPONSE',
+            }));
+        }
+        else {
+            msg.hap.newValue = newValue;
+            node.nodeStatusUtils.setStatus({
+                fill: 'yellow',
+                shape: 'dot',
+                text: `[${eventObject.name}] ${key}${newValue != undefined ? `: ${newValue}` : ''}`,
+            }, 3000);
+            (_d = node.childNodes) === null || _d === void 0 ? void 0 : _d.forEach((n) => n.nodeStatusUtils.clearStatusByType('NO_RESPONSE'));
+            (_e = node.parentNode) === null || _e === void 0 ? void 0 : _e.nodeStatusUtils.clearStatusByType('NO_RESPONSE');
+        }
         msg.payload[key] = newValue;
         if (connection) {
             msg.hap.session = {
@@ -45,11 +63,6 @@ module.exports = function (node) {
                 httpPort: connection.remotePort,
             };
         }
-        node.setStatus({
-            fill: 'yellow',
-            shape: 'dot',
-            text: `[${eventObject.name}] ${key}${newValue != undefined ? `: ${newValue}` : ''}`,
-        }, 3000);
         log.debug(`${node.name} received ${eventObject.name} ${key}: ${newValue}`);
         if (connection || node.hostNode.config.allowMessagePassthrough) {
             node.send(msg);
@@ -248,7 +261,7 @@ module.exports = function (node) {
     const waitForParent = () => {
         log.debug('Waiting for Parent Service');
         return new Promise((resolve) => {
-            node.setStatus({
+            node.nodeStatusUtils.setStatus({
                 fill: 'blue',
                 shape: 'dot',
                 text: 'Waiting for Parent Service',

package/build/nodes/bridge.html

@@ -13,6 +13,7 @@
             <option value="bonjour-hap" selected="selected">BONJOUR</option>
             <option value="ciao">CIAO</option>
             <option value="avahi">AVAHI</option>
+            <option value="resolved">RESOLVED</option>
         </select>
     </div>
     <div class="form-row">
@@ -99,7 +100,7 @@
     <ul>
         <li><strong>Pin Code</strong>: Specify the Pin for the pairing process.</li>
         <li><strong>Port</strong>: If you are behind a Firewall, you may want to specify a port. Cannot be 1880 as it is reserved for node-red. Otherwise, leave empty.</li>
-        <li><strong>Advertiser</strong>: Which MDNS advertiser to use <em>ciao</em> (new, improved but not yet proved) or (good old) <em>bonjour</em> or experimental <em>avahi</em>. Default <em>bonjour</em>.</li>
+        <li><strong>Advertiser</strong>: Which MDNS advertiser to use <em>ciao</em> (new, improved but not yet proved) or (good old) <em>bonjour</em> or experimental <em>avahi</em> and <em>resolved</em>. Default <em>bonjour</em>.</li>
         <li><strong>Allow Insecure Request</strong>: Should we allow insecure request? Default false.</li>
         <li><strong>Manufacturer, Model, Serial Number</strong>: Can be anything you want.</li>
         <li><strong>Firmware 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>
@@ -149,7 +150,7 @@
                 value: 'bonjour-hap',
                 required: false,
                 validate: function (value) {
-                    if (value) return value === 'bonjour-hap' || value === 'ciao' || value === 'avahi'
+                    if (value) return value === 'bonjour-hap' || value === 'ciao' || value === 'avahi' || value === 'resolved'
                     else return true
                 },
             },

package/build/nodes/bridge.js

@@ -3,8 +3,8 @@ 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("../lib/types/HostType"));
 const logger_1 = require("@nrchkb/logger");
+const HostType_1 = __importDefault(require("../lib/types/HostType"));
 const log = (0, logger_1.logger)('NRCHKB', 'HAPHostNode');
 module.exports = (RED) => {
     const HAPHostNode = require('../lib/HAPHostNode')(RED, HostType_1.default.BRIDGE);

package/build/nodes/nrchkb.js

@@ -26,10 +26,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const logger_1 = require("@nrchkb/logger");
+const hap_nodejs_1 = require("hap-nodejs");
 const path = __importStar(require("path"));
 const semver_1 = __importDefault(require("semver"));
-const hap_nodejs_1 = require("hap-nodejs");
-const logger_1 = require("@nrchkb/logger");
 const Storage_1 = require("../lib/Storage");
 (0, logger_1.loggerSetup)({ timestampEnabled: 'NRCHKB' });
 const log = (0, logger_1.logger)('NRCHKB');

package/build/nodes/standalone.html

@@ -20,6 +20,8 @@
         <select id="node-config-input-advertiser">
             <option value="bonjour-hap" selected="selected">BONJOUR</option>
             <option value="ciao">CIAO</option>
+            <option value="avahi">AVAHI</option>
+            <option value="resolved">RESOLVED</option>
         </select>
     </div>
     <div class="form-row">
@@ -105,7 +107,7 @@
         <li><strong>Accessory Category</strong>: What kind of category is this Accessory, default <em>OTHER</em></li>
         <li><strong>Pin Code</strong>: Specify the Pin for the pairing process.</li>
         <li><strong>Port</strong>: If you are behind a Firewall, you may want to specify a port. Cannot be 1880 as it is reserved for node-red. Otherwise, leave empty.</li>
-        <li><strong>Advertiser</strong>: Which MDNS advertiser to use <em>ciao</em> (new, improved but not yet proved) or (good old) <em>bonjour</em>. Default <em>bonjour</em>.</li>
+        <li><strong>Advertiser</strong>: Which MDNS advertiser to use <em>ciao</em> (new, improved but not yet proved) or (good old) <em>bonjour</em> or experimental <em>avahi</em> and <em>resolved</em>. Default <em>bonjour</em>.</li>
         <li><strong>Allow Insecure Request</strong>: Should we allow insecure request? Default false.</li>
         <li><strong>Manufacturer, Model, Serial Number</strong>: Can be anything you want.</li>
         <li><strong>Firmware 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>
@@ -157,7 +159,7 @@
                 value: 'bonjour-hap',
                 required: false,
                 validate: function (value) {
-                    if (value) return value === 'bonjour-hap' || value === 'ciao'
+                    if (value) return value === 'bonjour-hap' || value === 'ciao' || value === 'avahi' || value === 'resolved'
                     else return true
                 },
             },

package/build/nodes/standalone.js

@@ -3,8 +3,8 @@ 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("../lib/types/HostType"));
 const logger_1 = require("@nrchkb/logger");
+const HostType_1 = __importDefault(require("../lib/types/HostType"));
 const log = (0, logger_1.logger)('NRCHKB', 'HAPHostNode');
 module.exports = (RED) => {
     const HAPHostNode = require('../lib/HAPHostNode')(RED, HostType_1.default.STANDALONE);

package/build/nodes/status.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = require("@nrchkb/logger");
 const hap_nodejs_1 = require("hap-nodejs");
+const NodeStatusUtils_1 = require("../lib/utils/NodeStatusUtils");
 const log = (0, logger_1.logger)('NRCHKB', 'HAPStatusNode');
 module.exports = (RED) => {
     log.debug('Registering homekit-status type');
@@ -9,27 +10,7 @@ module.exports = (RED) => {
         const self = this;
         self.config = config;
         RED.nodes.createNode(self, config);
-        self.lastStatusId = 0;
-        self.setStatus = (status, timeout) => {
-            self.status(status);
-            self.lastStatusId = new Date().getTime();
-            if (timeout) {
-                self.clearStatus(self.lastStatusId, timeout);
-            }
-            return self.lastStatusId;
-        };
-        self.clearStatus = (statusId, delay) => {
-            if (statusId === self.lastStatusId) {
-                if (delay) {
-                    setTimeout(function () {
-                        self.setStatus({});
-                    }, delay);
-                }
-                else {
-                    self.setStatus({});
-                }
-            }
-        };
+        self.nodeStatusUtils = new NodeStatusUtils_1.NodeStatusUtils(self);
         try {
             self.serviceNode = RED.nodes.getNode(self.config.serviceNodeId);
         }
@@ -38,7 +19,7 @@ module.exports = (RED) => {
         }
         self.on('input', (_) => {
             if (self.serviceNode) {
-                self.setStatus({
+                self.nodeStatusUtils.setStatus({
                     fill: 'green',
                     shape: 'dot',
                     text: 'Done',
@@ -49,11 +30,11 @@ module.exports = (RED) => {
                 });
             }
             else {
-                self.setStatus({
+                self.nodeStatusUtils.setStatus({
                     fill: 'red',
                     shape: 'dot',
                     text: 'Check your config',
-                }, 3000);
+                });
             }
         });
         self.on('close', (_, done) => {

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "node-red-contrib-homekit-bridged",
-  "version": "1.5.0-dev.9",
+  "version": "1.5.0",
   "description": "Node-RED nodes to simulate Apple HomeKit devices.",
   "main": "build/nodes/nrchkb.js",
   "scripts": {
     "build": "npm run clean && tsc",
     "clean": "rimraf build/lib build/**/*.js",
-    "test": "npm run build && mocha -r ts-node/register './src/**/*.test.[tj]s' --exit",
+    "test": "mocha -r ts-node/register './src/**/*.test.[tj]s' --exit --timeout 30000",
     "prettier": "prettier --write \"**/*.{js,ts}\"",
+    "eslint": "eslint \"src/**/*.ts\"",
     "prepare": "husky install"
   },
   "repository": {
@@ -46,34 +47,36 @@
   "homepage": "https://github.com/NRCHKB/node-red-contrib-homekit-bridged#readme",
   "dependencies": {
     "@nrchkb/logger": "^1.3.3",
-    "hap-nodejs": "0.10.4",
+    "hap-nodejs": "0.11.0",
     "node-persist": "^3.1.0",
-    "semver": "^7.3.7",
+    "semver": "^7.3.8",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@homebridge/ciao": "^1.1.5",
     "@node-red/registry": "^2.2.3",
-    "@types/mocha": "^9.1.1",
+    "@types/mocha": "^10.0.0",
     "@types/node": "^10.17.60",
     "@types/node-persist": "^3.1.3",
     "@types/node-red": "^1.2.1",
-    "@types/semver": "^7.3.12",
+    "@types/node-red-node-test-helper": "^0.2.2",
+    "@types/semver": "^7.3.13",
     "@types/uuid": "^8.3.4",
-    "@typescript-eslint/eslint-plugin": "^5.37.0",
-    "@typescript-eslint/parser": "^5.37.0",
+    "@typescript-eslint/eslint-plugin": "^5.43.0",
+    "@typescript-eslint/parser": "^5.43.0",
     "babel-eslint": "^10.1.0",
-    "eslint": "^8.23.1",
+    "eslint": "^8.28.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "mocha": "^10.0.0",
+    "eslint-plugin-simple-import-sort": "^8.0.0",
+    "husky": "^8.0.2",
+    "mocha": "^10.1.0",
     "node-red": "^2.2.3",
     "node-red-node-test-helper": "^0.3.0",
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.3",
-    "husky": "^8.0.1"
+    "typescript": "^4.9.3"
   },
   "engines": {
     "node": ">=10.22.1"

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

@@ -1,8 +0,0 @@
-/// <reference types="node-red__registry" />
-import { NodeStatus } from '@node-red/registry';
-declare type StatusUtilType = {
-    lastStatusId: number;
-    setStatus: (status: string | NodeStatus, timeout?: number) => number;
-    clearStatus: (statusId: number, delay?: number) => void;
-};
-export default StatusUtilType;

package/build/lib/types/StatusUtilType.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });