node-red-contrib-homekit-bridged 1.5.0-dev.1 → 1.5.0-dev.11

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,11 @@ 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"));
 module.exports = (RED) => {
     const nrchkbConfigCompatibilityOverride = function () {
         const self = this;

package/build/lib/HAPServiceNode2.js

@@ -3,11 +3,11 @@ 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"));
 module.exports = (RED) => {
     const nrchkbConfigCompatibilityOverride = function () {
         const self = this;

package/build/lib/Storage.d.ts

@@ -1,7 +1,7 @@
-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';
+import { StorageType } from './types/storage/StorageType';
 declare 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,10 +23,10 @@ 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');
@@ -123,7 +123,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;

package/build/lib/cameraSource/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -321,8 +325,7 @@ Camera.prototype.handleStreamRequest = function (request) {
                     ' -r ' +
                     fps +
                     ' -f rawvideo' +
-                    ' ' +
-                    additionalCommandline +
+                    (additionalCommandline ? ' ' + additionalCommandline : '') +
                     (vf.length > 0 ? ' -vf ' + vf.join(',') : '') +
                     ' -b:v ' +
                     vbitrate +

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

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

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

@@ -1,8 +1,8 @@
-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';
+import NodeType from './NodeType';
 declare type HAPHostNodeType = NodeType & {
     config: HAPHostConfigType;
     mdnsConfig: MulticastOptions;

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

@@ -1,12 +1,12 @@
-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 HAPHostNodeType from './HAPHostNodeType';
+import HAPService2ConfigType from './HAPService2ConfigType';
+import HAPServiceNodeType from './HAPServiceNodeType';
+import NodeType from './NodeType';
 import PublishTimersType from './PublishTimersType';
 import StatusUtilType from './StatusUtilType';
-import HAPServiceNodeType from './HAPServiceNodeType';
-import { HAPConnection } from 'hap-nodejs/dist/lib/util/eventedhttp';
 declare type HAPService2NodeType = NodeType & {
     config: HAPService2ConfigType;
     RED: NodeAPI;

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

@@ -1,12 +1,12 @@
-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 HAPHostNodeType from './HAPHostNodeType';
+import HAPService2NodeType from './HAPService2NodeType';
+import HAPServiceConfigType from './HAPServiceConfigType';
+import NodeType from './NodeType';
 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 & {
     config: HAPServiceConfigType;
     RED: NodeAPI;

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

@@ -1,8 +1,8 @@
-import NodeType from './NodeType';
 import { NodeAPI } from 'node-red';
-import StatusUtilType from './StatusUtilType';
 import HAPServiceNodeType from './HAPServiceNodeType';
 import HAPStatusConfigType from './HAPStatusConfigType';
+import NodeType from './NodeType';
+import StatusUtilType from './StatusUtilType';
 declare type HAPStatusNodeType = NodeType & {
     config: HAPStatusConfigType;
     RED: NodeAPI;

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);

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);
@@ -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

@@ -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);
@@ -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/MdnsUtils.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

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);
@@ -49,21 +49,30 @@ module.exports = function (node) {
         msg.payload[key] = newValue;
         msg.hap = prepareHapData(context, connection);
         msg.hap.allChars = allCharacteristics.reduce((allChars, singleChar) => {
-            allChars[singleChar.displayName] = singleChar.value;
+            const cKey = singleChar.constructor.name;
+            allChars[cKey] = singleChar.value;
             return allChars;
         }, {});
         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);
+        if (!node.reachable) {
+            msg.hap.reachable = false;
+            node.setStatus({
+                fill: 'yellow',
+                shape: 'dot',
+                text: 'Not reachable',
+            }, 3000);
+        }
+        else {
+            msg.hap.reachable = true;
+            msg.hap.newValue = newValue;
+            node.setStatus({
+                fill: 'yellow',
+                shape: 'dot',
+                text: key + ': ' + newValue,
+            }, 3000);
+        }
         log.debug(`${node.name} received ${key} : ${newValue}`);
         if (connection ||
             context ||
@@ -132,7 +141,7 @@ module.exports = function (node) {
         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 {
                 const value = (_a = msg.payload) === null || _a === void 0 ? void 0 : _a[key];

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');
@@ -23,17 +23,32 @@ module.exports = function (node) {
         };
         msg.payload = {};
         msg.hap = {
-            newValue,
             event: eventObject,
             allChars: allCharacteristics.reduce((allChars, singleChar) => {
-                allChars[singleChar.displayName] = singleChar.value;
+                const cKey = singleChar.constructor.name;
+                allChars[cKey] = singleChar.value;
                 return allChars;
             }, {}),
+            oldValue,
         };
-        if (oldValue !== undefined) {
-            msg.hap.oldValue = oldValue;
-        }
         const key = this.constructor.name;
+        if (!node.reachable) {
+            msg.hap.reachable = false;
+            node.setStatus({
+                fill: 'yellow',
+                shape: 'dot',
+                text: 'Not reachable',
+            }, 3000);
+        }
+        else {
+            msg.hap.reachable = true;
+            msg.hap.newValue = newValue;
+            node.setStatus({
+                fill: 'yellow',
+                shape: 'dot',
+                text: `[${eventObject.name}] ${key}${newValue != undefined ? `: ${newValue}` : ''}`,
+            }, 3000);
+        }
         msg.payload[key] = newValue;
         if (connection) {
             msg.hap.session = {
@@ -44,11 +59,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);
@@ -153,7 +163,7 @@ 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 {

package/build/nodes/bridge.html

@@ -12,6 +12,7 @@
         <select id="node-config-input-advertiser">
             <option value="bonjour-hap" selected="selected">BONJOUR</option>
             <option value="ciao">CIAO</option>
+            <option value="avahi">AVAHI</option>
         </select>
     </div>
     <div class="form-row">
@@ -98,7 +99,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>. 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>. 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>
@@ -148,7 +149,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'
                     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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -22,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.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/package.json

@@ -1,16 +1,15 @@
 {
   "name": "node-red-contrib-homekit-bridged",
-  "version": "1.5.0-dev.1",
+  "version": "1.5.0-dev.11",
   "description": "Node-RED nodes to simulate Apple HomeKit devices.",
   "main": "build/nodes/nrchkb.js",
   "scripts": {
-    "build": "yarn clean && tsc",
+    "build": "npm run clean && tsc",
     "clean": "rimraf build/lib build/**/*.js",
-    "test": "yarn build && mocha -r ts-node/register './src/**/*.test.[tj]s' --exit",
+    "test": "npm run build && mocha -r ts-node/register './src/**/*.test.[tj]s' --exit --timeout 30000",
     "prettier": "prettier --write \"**/*.{js,ts}\"",
-    "_postinstall": "husky install",
-    "prepublishOnly": "pinst --disable",
-    "postpublish": "pinst --enable"
+    "eslint": "eslint \"**/*.ts\"",
+    "prepare": "husky install"
   },
   "repository": {
     "type": "git",
@@ -33,7 +32,8 @@
       "service": "build/nodes/service.js",
       "service2": "build/nodes/service2.js",
       "status": "build/nodes/status.js"
-    }
+    },
+    "version": ">=1.3.7"
   },
   "author": {
     "name": "Tadeusz Wyrzykowski",
@@ -47,34 +47,36 @@
   "homepage": "https://github.com/NRCHKB/node-red-contrib-homekit-bridged#readme",
   "dependencies": {
     "@nrchkb/logger": "^1.3.3",
-    "hap-nodejs": "^0.9.7",
+    "hap-nodejs": "0.10.4",
     "node-persist": "^3.1.0",
-    "semver": "^7.3.5",
-    "uuid": "^8.3.2"
+    "semver": "^7.3.7",
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@homebridge/ciao": "^1.1.3",
-    "@node-red/registry": "^1.3.7",
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^10.17.50",
-    "@types/node-persist": "^3.1.2",
-    "@types/node-red": "^1.1.1",
-    "@types/semver": "^7.3.9",
-    "@types/uuid": "^8.3.1",
-    "@typescript-eslint/eslint-plugin": "^5.3.1",
-    "@typescript-eslint/parser": "^5.3.1",
+    "@homebridge/ciao": "^1.1.5",
+    "@node-red/registry": "^2.2.3",
+    "@types/mocha": "^9.1.1",
+    "@types/node": "^10.17.60",
+    "@types/node-persist": "^3.1.3",
+    "@types/node-red": "^1.2.1",
+    "@types/node-red-node-test-helper": "^0.2.2",
+    "@types/semver": "^7.3.12",
+    "@types/uuid": "^8.3.4",
+    "@typescript-eslint/eslint-plugin": "^5.38.1",
+    "@typescript-eslint/parser": "^5.38.1",
     "babel-eslint": "^10.1.0",
-    "eslint": "^8.2.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "husky": "^7.0.4",
-    "mocha": "^9.1.3",
-    "node-red": "^1.3.7",
-    "node-red-node-test-helper": "^0.2.7",
-    "pinst": "^2.1.6",
-    "prettier": "^2.4.1",
-    "ts-node": "^10.4.0",
-    "typescript": "^4.4.4"
+    "eslint": "^8.24.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-simple-import-sort": "^8.0.0",
+    "husky": "^8.0.1",
+    "mocha": "^10.0.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.4"
   },
   "engines": {
     "node": ">=10.22.1"

package/CHANGELOG.md

@@ -1,349 +0,0 @@
-#### ⚠️ CAUTION ⚠️
-
-##### Before upgrading make sure that you are using the latest version of [Node-RED](https://nodered.org/docs/getting-started/local) and latest LTS version of [Node.js](https://nodejs.org/en/download/)
-
-###### Upgrading from versions 0.X to 1.X is a breaking change, all devices will be reset in the Home app. Please review the [release notes](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/releases/tag/v1.0.1) thoroughly before updating!
-
-# Changelog
-
-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.1]
-
-### Fixed
-
-- Accessory could not be recovered from NO_RESPONSE using single Characteristic
-
-### 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
-
-- Pass Characteristic key in event context for Service2
-
-### Changed
-
-- 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]
-
-### Fixed
-
-- Resolve issue with customCharacteristics not loading from file
-- Fixed publish process
-
-## [1.4.1]
-
-### Fixed
-
-- Fix readme appearance on `flows.nodered.org`
-
-## [1.4.0]
-
-### Fixed
-
-- Fixed customCharacteristics incorrect refresh in UI
-- Implemented static accessoryUUIDs for subflows Enables the use of nrchkb nodes in subflows with backwards
-  compatibility #393 - thanks @kevinkub
-- Fixed Custom MDNS Configuration not showing in UI for Standalone Accessory
-- Stop components from clearing other component's node.status call
-- Add missing advertiser selector in UI for Standalone Accessory
-- Not naming the host node causes a crash #424
-- Do not output oldValue for onSet as it does not have access to old value
-
-### Added
-
-- Notice during app launch: Node.js 10 will be deprecated in Node-RED 2.0.0
-- Event output in Service 2 which is available in NRCHKB_EXPERIMENTAL #392 #437
-- Status node to fetch Serialized Service #210
-- Support for environment variables in characteristic properties #217
-
-### 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 dependencies to latest versions
-- Changed `BatteryService` to `Battery` in demo examples as `BatteryService` is deprecated #381 - thanks @crxporter
-- Readme rework - thanks @crxporter
-- More descriptive error when incorrect Characteristic has been used in msg.payload
-- Add msg.hap.allChars to service nodes #438
-
-## [1.3.6]
-
-### Fixed
-
-- nrchkb complaining about validValues #52
-
-## [1.3.5]
-
-### Fixed
-
-- NO_RESPONSE not working
-
-## [1.3.4]
-
-### Fixed
-
-- onChange fired when value not changed #390 - thanks for reporting @Delphius7
-
-## [1.3.3]
-
-### Fixed
-
-- Resolve issues with incorrect Characteristics names used in node output
-
-## [1.3.2]
-
-### Fixed
-
-- Resolve issues with some Characteristics names not being accepted since hap-nodejs upgrade
-
-## [1.3.1]
-
-### Fixed
-
-- Fix allowMessagePassthrough=false not working for messages from Home.app
-
-## [1.3.0]
-
-### Fixed
-
-- There was a problem when mdnsConfig was
-  empty [#322](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/322)
-- There was a problem when NRCHKB was updated without Node-RED
-  restart [#363](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/363)
-- Linked service throws error during setup if parent waits for the setup message (thanks @AlexOwl)
-- . in Bridge name was causing it not being published without any feedback to user
-
-### Added
-
-- More code tests
-- Verify if Node.js version criteria is met on start
-- Support fo9r Standalone Accessory mode (like in old
-  times) [#310](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/310)
-- (Experimental) Support for Custom
-  Characteristics [#52](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/52)
-- Add client IP address to onSet/onChange output
-  message (`msg.hap.session`) [#328](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/328)
-- As of new mdns advertiser available now there is a possibility to choose which you want to use in Bridge Config:
-  ciao (
-  new, improved but not yet proved) or (good old) bonjour. Default bonjour
-
-### Changed
-
-- Updated hap-nodejs to 0.9.4
-- Updated dependencies to latest versions
-- TypeScript-ify code
-- Generate random pin code for new Bridge nodes
-
-## [1.2.0] - 2020.08.16
-
-### Fixed
-
-- JS console error when opening a linked
-  service [#278](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/278)
-- Fixed outputs number not being remembered by editor
-- Fixed saving Software Revision fo Service node
-- Fixed HAPStorage path on Windows
-- There was a translation issue, changed pilot to remote in README.
-
-### Added
-
-- Added Firmware, Software and Hardware Revision fields to Bridge configuration
-- Now we have examples that you can import in node-red!
-- You can make Service node wait for setup message.
-
-### Changed
-
-- Now Firmware, Software and Hardware Revision and Model fields are set by default to NRCHKB version, Manufacturer is
-  NRCHKB by default
-- Updated hap-nodejs to 0.7.8
-- Updated dependencies to latest versions
-- Disallow using port 1880 for Bridge as that port is reserved for node-red
-
-## [1.1.1] - 2020.06.30
-
-### Added
-
-- Firmware Revision configuration option (
-  optional) [#211](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/pull/211)
-- Hardware and Software Revision configuration option (optional)
-- Project now support typescript!
-
-### Fixed
-
-- Error status is not passed to callback when "No response" was
-  triggered [#227](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/pull/227) also discussed
-  in [#185](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/pull/185)
-
-### Changed
-
-- Some README.md rework
-- Updated hap-nodejs to 0.7.3
-- Updated dependencies to latest versions
-- Moved lint-staged config to main level and added minimum nodejs version
-
-### Removed
-
-- Some unused code disappeared.
-
-## [1.0.4] - 2020.03.03
-
-### Fixed
-
-- Warn when trying to deploy node without bridge or parentService
-  attached [#214](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/214#issuecomment-594084125)
-- Additional Command Line value in Camera Control is now
-  optional [#214](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/214#issuecomment-593736115)
-
-## [1.0.3] - 2020.03.01
-
-### Fixed
-
-- Video Filter value in Camera Control is now optional in node-red editor
-  too [#214](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/214)
-
-## [1.0.2] - 2020.03.01
-
-### Added
-
-- Warning about lost compatibility on README page.
-
-## [1.0.0] - 2020.02.23
-
-Lost backward compatibility. In order to make it work read
-this [notice](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/pull/163#issuecomment-590108567).
-
-### Fixed
-
-- Node id macify algorithm changed [#170](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/170)
-- Corrections regarding issue [#12](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/12) so that
-  changes can be deployed without restarting node-red
-- Automatically creating a new service and replacing the old one if the service type changed
-- Automatically replacing an accessory with a new one if the accessory information changes (e.g., Name, Manufacturer,
-  ...)
-- Video Filter value in Camera Control is now
-  optional [#194](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/194) (can be empty, before it was
-  generated if was empty)
-- Removed updateReachability as it is deprecated (and doesn't make a difference)
-
-### Added
-
-- After Service selection in node configuration Category will be automatically set to default for Service
-- Interface Name for Camera Service configuration
-- Support for new TV Remote services
-- Now first output is for onChange, second for onSet and third for camera
-  snapshot. [#200](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/200)
-- Sponsor Button on repository page
-
-### Changed
-
-- Accessory Category in node configuration moved under Service selection
-- Clarify NO_RESPONSE in README
-- Update node-red version in dependencies
-- Camera Service source code to match the newest improvements in homebridge-camera-ffmpeg
-- Update to latest HAP-NodeJS
-- Removed unnecessary accessory category from service node
-- Removed fields Manufacturer, Serial Number and Model from linked service nodes
-- Moved eslint and prettier configuration to package.json
-- Added automatic linting on pre-commit
-
-## [0.8.0] - 2019.10.14
-
-### Added
-
-- Added greenkeeper
-- Added setting to Bridge configuration called Allow Message Passthrough
-
-### Changed
-
-- Updated README
-
-### Fixed
-
-- Revert hap.context in node output
-
-## [0.7.1] - 2019.10.13
-
-### Fixed
-
-- Added labels to node outputs as there are new output for camera snapshot
-
-## [0.7.0] - 2019.10.12
-
-### Added
-
-- CHANGELOG page introduction
-- Change from "characteristic-change" to "set" to listen to HAP-NodeJS events
-- Sorted Service Type list in UI
-- Camera support (RTSP, Video Doorbell and others)
-- RemoteKey value now appears in node output!
-- HAP-NodeJS version changed to latest (0.5.0)
-- Added Accessory Category field for Parent Service
-- More code refactoring
-- The Newest HomeKit Docs uploaded
-- Security hints
-- And more...
-
-### Changed
-
-- MIT license
-- Better node-red tests
-- Prettified and linted code!
-- Support for node 8 and 10 only
-- GitHub Actions for automatic tests and publish
-- And more...
-
-### Fixed
-
-- Removed read/write boundaries for Characteristics
-- And more...
-
-## [0.6.2] - 2019.03.27
-
-### Changed
-
-- Some minor changes in README
-
-### Fixed
-
-- Hotfix for "NO_RESPONSE"
-
-## [0.6.1] - 2019.03.21
-
-### Added
-
-- Reintroduced DEBUG mode (DEBUG=NRCHKB node-red)
-
-### Changed
-
-- Renaming organisation
-- Minor changes to process of finding Parent Service as Linked Service
-
-### Fixed
-
-- Crash upon removing bridge from Home [#22](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/22)
-- Fix: "Error: This callback function has already been called by someone
-  else..." [#66](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/66)
-
-## [0.6.0] - 2019.03.16
-
-### Added
-
-- Introduce Linked Services [#41](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/41)
-- MDNS Configuration [#44](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/44)
-- Filter on Topic
-- NO_RESPONSE trigger [#48](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/48)
-- onIdentify [#54](https://github.com/NRCHKB/node-red-contrib-homekit-bridged/issues/54)
-- Added automatic tests for building project, code quality and finding vulnerabilities
-
-### Changed
-
-- Redesigned README