node-red-contrib-homekit-bridged 1.7.3 → 2.0.0-dev.0

package/build/lib/HAPHostNode.js

@@ -12,17 +12,16 @@ 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("@homebridge/hap-nodejs");
 const logger_1 = require("@nrchkb/logger");
-const hap_nodejs_1 = require("hap-nodejs");
 const semver_1 = require("semver");
 const preload_1 = __importDefault(require("semver/preload"));
 const NRCHKBError_1 = __importDefault(require("./NRCHKBError"));
 const HapCategories_1 = __importDefault(require("./types/hap-nodejs/HapCategories"));
 const HostType_1 = __importDefault(require("./types/HostType"));
 module.exports = (RED, hostType) => {
-    const MdnsUtils = require('./utils/MdnsUtils')();
     const init = function (config) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c;
         const self = this;
         const log = (0, logger_1.logger)('NRCHKB', 'HAPHostNode', config.bridgeName, self);
         self.hostType = hostType;
@@ -36,31 +35,6 @@ module.exports = (RED, hostType) => {
         if (preload_1.default.parse(config.firmwareRev) == null) {
             config.firmwareRev = new semver_1.SemVer('0.0.0');
         }
-        if (!((_a = config.bind) === null || _a === void 0 ? void 0 : _a.length) && config.customMdnsConfig) {
-            log.error('Custom mdns config is deprecated, use bind instead!');
-            self.mdnsConfig = {};
-            if (MdnsUtils.checkMulticast(config.mdnsMulticast)) {
-                self.mdnsConfig.multicast = config.mdnsMulticast;
-            }
-            if (MdnsUtils.checkInterface(config.mdnsInterface)) {
-                self.mdnsConfig.interface = config.mdnsInterface;
-            }
-            if (MdnsUtils.checkPort(config.mdnsPort)) {
-                self.mdnsConfig.port = parseInt((_b = config.mdnsPort) === null || _b === void 0 ? void 0 : _b.toString());
-            }
-            if (MdnsUtils.checkIp(config.mdnsIp)) {
-                self.mdnsConfig.ip = config.mdnsIp;
-            }
-            if (MdnsUtils.checkTtl(config.mdnsTtl)) {
-                self.mdnsConfig.ttl = parseInt((_c = config.mdnsTtl) === null || _c === void 0 ? void 0 : _c.toString());
-            }
-            if (MdnsUtils.checkLoopback(config.mdnsLoopback)) {
-                self.mdnsConfig.loopback = config.mdnsLoopback;
-            }
-            if (MdnsUtils.checkReuseAddr(config.mdnsReuseAddr)) {
-                self.mdnsConfig.reuseAddr = config.mdnsReuseAddr;
-            }
-        }
         self.accessoryCategory = (self.hostType == HostType_1.default.BRIDGE
             ? HapCategories_1.default.BRIDGE
             : self.config.accessoryCategory);
@@ -82,15 +56,14 @@ module.exports = (RED, hostType) => {
             self.host = new hap_nodejs_1.Accessory(self.name, hostUUID);
         }
         self.publish = function () {
-            var _a, _b, _c, _d;
+            var _a, _b;
             if (self.hostType == HostType_1.default.BRIDGE) {
                 log.debug(`Publishing ${hostTypeName} with pin code ${self.config.pinCode} and ${self.host.bridgedAccessories.length} accessories`);
             }
             else {
                 log.debug(`Publishing ${hostTypeName} with pin code ${self.config.pinCode}`);
             }
-            if ((self.config.port && self.config.port == 1880) ||
-                (((_a = self.mdnsConfig) === null || _a === void 0 ? void 0 : _a.port) && ((_b = self.mdnsConfig) === null || _b === void 0 ? void 0 : _b.port) == 1880)) {
+            if (self.config.port && self.config.port == 1880) {
                 log.error(`Cannot publish on ${hostTypeName} port 1880 as it is reserved for node-red`);
                 self.published = false;
                 return false;
@@ -101,7 +74,7 @@ module.exports = (RED, hostType) => {
                 oldPinCode = `${oldPinCode.slice(0, 3)}-${oldPinCode.slice(3, 5)}-${oldPinCode.slice(5, 8)}`;
             }
             let bind;
-            if (((_c = self.config.bind) === null || _c === void 0 ? void 0 : _c.length) && self.config.bindType) {
+            if (((_a = self.config.bind) === null || _a === void 0 ? void 0 : _a.length) && self.config.bindType) {
                 if (self.config.bindType == 'str') {
                     bind = self.config.bind;
                 }
@@ -116,9 +89,8 @@ module.exports = (RED, hostType) => {
                     : 0,
                 pincode: oldPinCode,
                 category: self.accessoryCategory,
-                mdns: self.mdnsConfig,
                 bind: bind,
-                advertiser: (_d = self.config.advertiser) !== null && _d !== void 0 ? _d : "bonjour-hap",
+                advertiser: (_b = self.config.advertiser) !== null && _b !== void 0 ? _b : "bonjour-hap",
             }, self.config.allowInsecureRequest);
             self.published = true;
             return true;
@@ -152,9 +124,9 @@ module.exports = (RED, hostType) => {
             .setCharacteristic(hap_nodejs_1.Characteristic.Manufacturer, self.config.manufacturer)
             .setCharacteristic(hap_nodejs_1.Characteristic.SerialNumber, self.config.serialNo)
             .setCharacteristic(hap_nodejs_1.Characteristic.Model, self.config.model)
-            .setCharacteristic(hap_nodejs_1.Characteristic.FirmwareRevision, (_d = self.config.firmwareRev) === null || _d === void 0 ? void 0 : _d.toString())
-            .setCharacteristic(hap_nodejs_1.Characteristic.HardwareRevision, (_e = self.config.hardwareRev) === null || _e === void 0 ? void 0 : _e.toString())
-            .setCharacteristic(hap_nodejs_1.Characteristic.SoftwareRevision, (_f = self.config.softwareRev) === null || _f === void 0 ? void 0 : _f.toString());
+            .setCharacteristic(hap_nodejs_1.Characteristic.FirmwareRevision, (_a = self.config.firmwareRev) === null || _a === void 0 ? void 0 : _a.toString())
+            .setCharacteristic(hap_nodejs_1.Characteristic.HardwareRevision, (_b = self.config.hardwareRev) === null || _b === void 0 ? void 0 : _b.toString())
+            .setCharacteristic(hap_nodejs_1.Characteristic.SoftwareRevision, (_c = self.config.softwareRev) === null || _c === void 0 ? void 0 : _c.toString());
     };
     const macify = (nodeId) => {
         if (nodeId) {

package/build/lib/HAPServiceNode.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("@homebridge/hap-nodejs");
 const logger_1 = require("@nrchkb/logger");
-const hap_nodejs_1 = require("hap-nodejs");
 const NRCHKBError_1 = __importDefault(require("./NRCHKBError"));
 const HostType_1 = __importDefault(require("./types/HostType"));
 const NodeStatusUtils_1 = require("./utils/NodeStatusUtils");

package/build/lib/HAPServiceNode2.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("@homebridge/hap-nodejs");
 const logger_1 = require("@nrchkb/logger");
-const hap_nodejs_1 = require("hap-nodejs");
 const NRCHKBError_1 = __importDefault(require("./NRCHKBError"));
 const HostType_1 = __importDefault(require("./types/HostType"));
 const NodeStatusUtils_1 = require("./utils/NodeStatusUtils");

package/build/lib/Storage.d.ts

@@ -1,4 +1,4 @@
-import { CharacteristicEventTypes, SerializedAccessory, SerializedService } from 'hap-nodejs';
+import { CharacteristicEventTypes, SerializedAccessory, SerializedService } from '@homebridge/hap-nodejs';
 import storage, { InitOptions } from 'node-persist';
 import { SerializedHostType } from './types/storage/SerializedHostType';
 import { StorageType } from './types/storage/StorageType';

package/build/lib/api.js

@@ -23,8 +23,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("@homebridge/hap-nodejs");
 const logger_1 = require("@nrchkb/logger");
-const hap_nodejs_1 = require("hap-nodejs");
 const EveCharacteristics_1 = __importDefault(require("./hap/eve-app/EveCharacteristics"));
 const Storage_1 = require("./Storage");
 const HapCategories_1 = __importDefault(require("./types/hap-nodejs/HapCategories"));
@@ -43,6 +43,9 @@ module.exports = function (RED) {
             BridgingState: {
                 nrchkbDisabledText: 'BridgingState (deprecated, unused)',
             },
+            CameraControl: {
+                nrchkbDisabledText: 'CameraControl (deprecated, replaced by)',
+            },
             CameraEventRecordingManagement: {
                 nrchkbDisabledText: 'CameraEventRecordingManagement (deprecated, replaced by CameraRecordingManagement)',
             },

package/build/lib/hap/HAPCharacteristic.d.ts

@@ -1,4 +1,4 @@
-import { Characteristic } from 'hap-nodejs';
+import { Characteristic } from '@homebridge/hap-nodejs';
 import { EveS2R1, EveS2R2, EveS2W1, EveS2W2 } from './eve-app/EveCharacteristics';
 declare class HAPCharacteristic extends Characteristic {
     static EveS2R1: typeof EveS2R1;

package/build/lib/hap/HAPCharacteristic.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const hap_nodejs_1 = require("hap-nodejs");
+const hap_nodejs_1 = require("@homebridge/hap-nodejs");
 class HAPCharacteristic extends hap_nodejs_1.Characteristic {
 }
 exports.default = HAPCharacteristic;

package/build/lib/hap/HAPService.d.ts

@@ -1,4 +1,4 @@
-import { Service } from 'hap-nodejs';
+import { Service } from '@homebridge/hap-nodejs';
 import { EveHistoryData } from './eve-app/EveServices';
 declare class HAPService extends Service {
     static EveHistoryData: typeof EveHistoryData;

package/build/lib/hap/HAPService.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const hap_nodejs_1 = require("hap-nodejs");
+const hap_nodejs_1 = require("@homebridge/hap-nodejs");
 class HAPService extends hap_nodejs_1.Service {
 }
 exports.default = HAPService;

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

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

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

@@ -1,4 +1,4 @@
-import { MDNSAdvertiser } from 'hap-nodejs';
+import { MDNSAdvertiser } from '@homebridge/hap-nodejs';
 import { NodeDef } from 'node-red';
 import { SemVer } from 'semver';
 import HapCategories from './hap-nodejs/HapCategories';
@@ -15,14 +15,6 @@ type HAPHostConfigType = NodeDef & {
     softwareRev: SemVer;
     bind?: string;
     bindType?: 'json' | 'str';
-    customMdnsConfig: boolean;
-    mdnsMulticast: boolean;
-    mdnsInterface: string;
-    mdnsPort: number;
-    mdnsIp: string;
-    mdnsTtl: number;
-    mdnsLoopback: boolean;
-    mdnsReuseAddr: boolean;
     allowMessagePassthrough: boolean;
     accessoryCategory: HapCategories;
     advertiser: MDNSAdvertiser;

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

@@ -1,11 +1,9 @@
-import { Accessory, Categories } from 'hap-nodejs';
-import BonjourMulticastOptions from './hap-nodejs/BonjourMulticastOptions';
+import { Accessory, Categories } from '@homebridge/hap-nodejs';
 import HAPHostConfigType from './HAPHostConfigType';
 import HostType from './HostType';
 import NodeType from './NodeType';
 type HAPHostNodeType = NodeType & {
     config: HAPHostConfigType;
-    mdnsConfig: BonjourMulticastOptions;
     accessoryCategory: Categories;
     published: boolean;
     bridgeUsername: string;

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

@@ -1,4 +1,4 @@
-import { AdaptiveLightingControllerMode } from 'hap-nodejs/dist/lib/controller/AdaptiveLightingController';
+import { AdaptiveLightingControllerMode } from '@homebridge/hap-nodejs/dist/lib/controller/AdaptiveLightingController';
 import { NodeDef } from 'node-red';
 import CameraConfigType from './CameraConfigType';
 type HAPServiceConfigType = NodeDef & {

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

@@ -1,5 +1,6 @@
-import { Accessory, AdaptiveLightingController, Characteristic, CharacteristicChange, CharacteristicGetCallback, CharacteristicProps, CharacteristicSetCallback, CharacteristicValue, Service } from 'hap-nodejs';
-import { HAPConnection } from 'hap-nodejs/dist/lib/util/eventedhttp';
+import { Accessory, AdaptiveLightingController, Characteristic, CharacteristicChange, CharacteristicGetCallback, CharacteristicProps, CharacteristicSetCallback, CharacteristicValue, Service } from '@homebridge/hap-nodejs';
+import { CharacteristicContext } from '@homebridge/hap-nodejs/dist/lib/Characteristic';
+import { HAPConnection } from '@homebridge/hap-nodejs/dist/lib/util/eventedhttp';
 import { NodeAPI } from 'node-red';
 import { NodeStatusUtils } from '../utils/NodeStatusUtils';
 import HAPHostNodeType from './HAPHostNodeType';
@@ -26,8 +27,8 @@ type HAPServiceNodeType = NodeType & {
     supported: string[];
     publishTimers: PublishTimersType;
     topic_in: string;
-    onCharacteristicGet: (this: Characteristic, callback: CharacteristicGetCallback, context: any, connection?: HAPConnection) => void;
-    onCharacteristicSet: (this: Characteristic, newValue: CharacteristicValue, callback: CharacteristicSetCallback, context: any, connection?: HAPConnection) => void;
+    onCharacteristicGet: (this: Characteristic, callback: CharacteristicGetCallback, context: CharacteristicContext, connection?: HAPConnection) => void;
+    onCharacteristicSet: (this: Characteristic, value: CharacteristicValue, callback: CharacteristicSetCallback, context: CharacteristicContext, connection?: HAPConnection) => void;
     onCharacteristicChange: (this: Characteristic, change: CharacteristicChange) => void;
     uniqueIdentifier: string;
     reachable?: boolean;

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

@@ -1,4 +1,4 @@
-import { SerializedAccessory } from 'hap-nodejs';
+import { SerializedAccessory } from '@homebridge/hap-nodejs';
 type SerializedHostType = {
     _isBridge: boolean;
 } & SerializedAccessory;

package/build/lib/utils/AccessoryUtils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = require("@nrchkb/logger");
 module.exports = function (node) {
-    const HapNodeJS = require('hap-nodejs');
+    const HapNodeJS = require('@homebridge/hap-nodejs');
     const Accessory = HapNodeJS.Accessory;
     const Service = HapNodeJS.Service;
     const Characteristic = HapNodeJS.Characteristic;

package/build/lib/utils/CharacteristicUtils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const hap_nodejs_1 = require("@homebridge/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("@homebridge/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/ServiceUtils.js

@@ -37,15 +37,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const util = __importStar(require("node:util"));
+const hap_nodejs_1 = require("@homebridge/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);
-    const HapNodeJS = require('hap-nodejs');
+    const HapNodeJS = require('@homebridge/hap-nodejs');
     const Service = HapNodeJS.Service;
     const Characteristic = HapNodeJS.Characteristic;
-    const CameraSource = require('../cameraSource').Camera;
     const NO_RESPONSE_MSG = 'NO_RESPONSE';
     const prepareHapData = (context, connection) => {
         const hap = {};
@@ -198,7 +197,7 @@ module.exports = function (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);
@@ -266,14 +265,13 @@ module.exports = function (node) {
         }
         return service;
     };
-    const configureCameraSource = function (accessory, service, config) {
+    const configureCameraSource = function (_accessory, _service, config) {
         if (config.cameraConfigSource) {
             log.debug('Configuring Camera Source');
             if (!config.cameraConfigVideoProcessor) {
                 log.error('Missing configuration for CameraControl: videoProcessor cannot be empty!');
             }
             else {
-                accessory.configureCameraSource(new CameraSource(service, config, node));
             }
         }
         else {

package/build/lib/utils/ServiceUtils2.js

@@ -3,17 +3,16 @@ 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("@homebridge/hap-nodejs");
 const logger_1 = require("@nrchkb/logger");
-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 ServiceUtilsLegacy = require('./ServiceUtils')(node);
-    const HapNodeJS = require('hap-nodejs');
+    const HapNodeJS = require('@homebridge/hap-nodejs');
     const Service = HapNodeJS.Service;
     const Characteristic = HapNodeJS.Characteristic;
-    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;
@@ -185,7 +184,7 @@ module.exports = function (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);
@@ -253,14 +252,13 @@ module.exports = function (node) {
         }
         return service;
     };
-    const configureCameraSource = function (accessory, service, config) {
+    const configureCameraSource = function (_accessory, _service, config) {
         if (config.cameraConfigSource) {
             log.debug('Configuring Camera Source');
             if (!config.cameraConfigVideoProcessor) {
                 log.error('Missing configuration for CameraControl: videoProcessor cannot be empty!');
             }
             else {
-                accessory.configureCameraSource(new CameraSource(service, config, node));
             }
         }
         else {

package/build/lib/utils/index.js

@@ -5,12 +5,10 @@ module.exports = function (node) {
     const BridgeUtils = require('./BridgeUtils')();
     const AccessoryUtils = require('./AccessoryUtils')(node);
     const CharacteristicUtils = require('./CharacteristicUtils')(node);
-    const MdnsUtils = require('./MdnsUtils')();
     return {
         ServiceUtils,
         BridgeUtils,
         AccessoryUtils,
         CharacteristicUtils,
-        MdnsUtils,
     };
 };

package/build/nodes/nrchkb.js

@@ -36,8 +36,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("@homebridge/hap-nodejs");
 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 Storage_1 = require("../lib/Storage");

package/build/nodes/status.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const hap_nodejs_1 = require("@homebridge/hap-nodejs");
 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) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-homekit-bridged",
-    "version": "1.7.3",
+    "version": "2.0.0-dev.0",
     "description": "Node-RED nodes to simulate Apple HomeKit devices.",
     "main": "build/nodes/nrchkb.js",
     "scripts": {
@@ -8,7 +8,7 @@
         "clean": "del-cli \"build/lib\" \"build/**/*.js\"",
         "test": "mocha -r ts-node/register './src/**/*.test.[tj]s' --exit --timeout 30000",
         "prettier": "prettier --write \"**/*.{js,ts}\"",
-        "eslint": "eslint \"src/**/*.ts\"",
+        "eslint": "eslint \"src/**/*.ts\" --fix",
         "prepare": "husky install"
     },
     "repository": {
@@ -43,20 +43,20 @@
     "homepage": "https://github.com/NRCHKB/node-red-contrib-homekit-bridged#readme",
     "dependencies": {
         "@nrchkb/logger": "~3.1.1",
-        "hap-nodejs": "0.12.3",
+        "@homebridge/hap-nodejs": "2.0.2",
         "node-persist": "^3.1.3",
-        "semver": "~7.6.3",
+        "semver": "~7.7.3",
         "uuid": "~11.0.5"
     },
     "devDependencies": {
-        "@homebridge/ciao": "~1.3.1",
-        "@node-red/registry": "^4.0.8",
+        "@homebridge/ciao": "~1.3.4",
+        "@node-red/registry": "^4.1.1",
         "@types/mocha": "^10.0.10",
-        "@types/node": "^18",
+        "@types/node": "^20",
         "@types/node-persist": "^3.1.8",
         "@types/node-red": "^1.3.5",
-        "@types/node-red-node-test-helper": "^0.3.4",
-        "@types/semver": "^7.5.8",
+        "@types/node-red-node-test-helper": "^0.3.5",
+        "@types/semver": "^7.7.1",
         "@types/uuid": "^10.0.0",
         "@typescript-eslint/eslint-plugin": "^7.16.0",
         "@typescript-eslint/parser": "^7.16.0",
@@ -64,18 +64,18 @@
         "del-cli": "^5.1.0",
         "eslint": "^8",
         "eslint-config-prettier": "^9.1.0",
-        "eslint-plugin-prettier": "^5.1.3",
+        "eslint-plugin-prettier": "^5.5.4",
         "eslint-plugin-simple-import-sort": "^12.1.1",
-        "husky": "^9.0.11",
+        "husky": "^9.1.7",
         "mocha": "^10.6.0",
-        "node-red": "^4.0.8",
-        "node-red-node-test-helper": "^0.3.4",
-        "prettier": "^3.4.2",
+        "node-red": "^4.1.1",
+        "node-red-node-test-helper": "^0.3.5",
+        "prettier": "^3.6.2",
         "ts-node": "^10.9.2",
         "typescript": "^5.7.3"
     },
     "engines": {
-        "node": ">=18"
+        "node": "^20 || ^22 || ^24"
     },
     "files": [
         "/build",

package/build/lib/cameraSource/index.d.ts

@@ -1 +0,0 @@
-export {};

package/build/lib/cameraSource/index.js

@@ -1,477 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = require("@nrchkb/logger");
-const util = __importStar(require("util"));
-const HapNodeJS = require('hap-nodejs');
-const uuid = HapNodeJS.uuid;
-const StreamController = HapNodeJS.StreamController;
-const crypto = require('crypto');
-const fs = require('fs');
-const os = require('os');
-const spawn = require('child_process').spawn;
-const log = (0, logger_1.logger)('CameraSource');
-module.exports = {
-    Camera: Camera,
-};
-function Camera(cameraControlService, config, cameraNode) {
-    this.configure(config, cameraControlService);
-    this.cameraNode = cameraNode;
-}
-Camera.prototype.configure = function (config, cameraControlService) {
-    this.name = config.name;
-    this.vcodec = config.cameraConfigVideoCodec;
-    this.videoProcessor = config.cameraConfigVideoProcessor;
-    this.audio = config.cameraConfigAudio;
-    this.acodec = config.cameraConfigAudioCodec;
-    this.packetsize = config.cameraConfigPacketSize;
-    this.fps = config.cameraConfigMaxFPS;
-    this.maxBitrate = config.cameraConfigMaxBitrate;
-    this.debug = config.cameraConfigDebug;
-    this.additionalCommandline = config.cameraConfigAdditionalCommandLine;
-    this.vflip = config.cameraConfigVerticalFlip;
-    this.hflip = config.cameraConfigHorizontalFlip;
-    this.mapvideo = config.cameraConfigMapVideo;
-    this.mapaudio = config.cameraConfigMapAudio;
-    this.videoFilter = config.cameraConfigVideoFilter;
-    this.uploader = config.cameraConfigSnapshotOutput;
-    this.interfaceName = config.cameraConfigInterfaceName;
-    if (!config.cameraConfigSource) {
-        throw new NRCHKBError('Missing source for camera.');
-    }
-    if (this.interfaceName !== '') {
-        if (!Object.keys(require('os').networkInterfaces()).includes(this.interfaceName)) {
-            throw new NRCHKBError('Incorrect interface name for camera.');
-        }
-    }
-    this.ffmpegSource = config.cameraConfigSource;
-    this.ffmpegImageSource = config.cameraConfigStillImageSource;
-    this.services = [];
-    this.streamControllers = [];
-    this.pendingSessions = {};
-    this.ongoingSessions = {};
-    const numberOfStreams = config.cameraConfigMaxStreams;
-    const videoResolutions = [];
-    this.maxWidth = config.cameraConfigMaxWidth;
-    this.maxHeight = config.cameraConfigMaxHeight;
-    const maxFPS = this.fps > 30 ? 30 : this.fps;
-    if (this.maxWidth >= 320) {
-        if (this.maxHeight >= 240) {
-            videoResolutions.push([320, 240, maxFPS]);
-            if (maxFPS > 15) {
-                videoResolutions.push([320, 240, 15]);
-            }
-        }
-        if (this.maxHeight >= 180) {
-            videoResolutions.push([320, 180, maxFPS]);
-            if (maxFPS > 15) {
-                videoResolutions.push([320, 180, 15]);
-            }
-        }
-    }
-    if (this.maxWidth >= 480) {
-        if (this.maxHeight >= 360) {
-            videoResolutions.push([480, 360, maxFPS]);
-        }
-        if (this.maxHeight >= 270) {
-            videoResolutions.push([480, 270, maxFPS]);
-        }
-    }
-    if (this.maxWidth >= 640) {
-        if (this.maxHeight >= 480) {
-            videoResolutions.push([640, 480, maxFPS]);
-        }
-        if (this.maxHeight >= 360) {
-            videoResolutions.push([640, 360, maxFPS]);
-        }
-    }
-    if (this.maxWidth >= 1280) {
-        if (this.maxHeight >= 960) {
-            videoResolutions.push([1280, 960, maxFPS]);
-        }
-        if (this.maxHeight >= 720) {
-            videoResolutions.push([1280, 720, maxFPS]);
-        }
-    }
-    if (this.maxWidth >= 1920) {
-        if (this.maxHeight >= 1080) {
-            videoResolutions.push([1920, 1080, maxFPS]);
-        }
-    }
-    let options = {
-        proxy: false,
-        srtp: true,
-        video: {
-            resolutions: videoResolutions,
-            codec: {
-                profiles: [0, 1, 2],
-                levels: [0, 1, 2],
-            },
-        },
-        audio: {
-            codecs: [
-                {
-                    type: 'OPUS',
-                    samplerate: 24,
-                },
-                {
-                    type: 'AAC-eld',
-                    samplerate: 16,
-                },
-            ],
-        },
-    };
-    if (cameraControlService) {
-        this._createStreamControllers(cameraControlService, numberOfStreams, options);
-    }
-    else {
-        log.error('Camera reconfigure on the fly is not yet supported. ' +
-            'Please restart node-red to apply all changes to the Camera.');
-    }
-};
-Camera.prototype.handleCloseConnection = function (connectionID) {
-    this.streamControllers.forEach(function (controller) {
-        controller.handleCloseConnection(connectionID);
-    });
-};
-Camera.prototype.handleSnapshotRequest = function (request, callback) {
-    let resolution = request.width + 'x' + request.height;
-    let imageSource = this.ffmpegImageSource;
-    if (imageSource === undefined || !imageSource.trim()) {
-        imageSource = this.ffmpegSource;
-    }
-    let ffmpeg = spawn(this.videoProcessor, (imageSource + ' -t 1 -s ' + resolution + ' -f image2 -').split(' '), { env: process.env });
-    let imageBuffer = Buffer.alloc(0);
-    log.debug('Snapshot from ' + this.name + ' at ' + resolution);
-    log.debug('ffmpeg ' + imageSource + ' -t 1 -s ' + resolution + ' -f image2 -');
-    ffmpeg.stdout.on('data', function (data) {
-        imageBuffer = Buffer.concat([imageBuffer, data]);
-    });
-    ffmpeg.on('error', function (error) {
-        log.error('An error occurs while making snapshot request');
-        log.error(util.inspect(error));
-    });
-    ffmpeg.on('close', function (code) {
-        let msg;
-        if (this.cameraNode) {
-            const topic = this.cameraNode.topic
-                ? this.cameraNode.topic
-                : this.cameraNode.topic_in;
-            msg = { payload: {}, name: this.cameraNode.name, topic: topic };
-        }
-        if (this.uploader !== 'disabled' && !this.cameraNode) {
-            log.error('Node required for camera to send snapshot!');
-        }
-        else if (this.uploader === 'path') {
-            const filePath = __dirname + '/../../cameraSnapshots/' + new Date().getTime();
-            log.debug('Saving camera snapshot to: ' + filePath);
-            const self = this;
-            fs.writeFile(filePath, imageBuffer, function (err) {
-                if (err) {
-                    log.error('Camera snapshot file failed to save due to: ' + err);
-                    return;
-                }
-                msg.payload['cameraSnapshot'] = filePath;
-                log.debug('Camera snapshot file has been saved! Sending to output... ' +
-                    JSON.stringify(msg));
-                self.cameraNode.send([null, msg]);
-            });
-        }
-        else if (this.uploader === 'content') {
-            msg.payload['cameraSnapshot'] = imageBuffer;
-            log.debug('Sending camera snapshot buffer to output...' +
-                JSON.stringify(msg));
-            this.cameraNode.send([null, null, msg]);
-        }
-        callback(undefined, imageBuffer);
-    }.bind(this));
-};
-Camera.prototype.prepareStream = function (request, callback) {
-    const sessionInfo = {};
-    let sessionID = request['sessionID'];
-    sessionInfo['address'] = request['targetAddress'];
-    const response = {};
-    let videoInfo = request['video'];
-    if (videoInfo) {
-        let targetPort = videoInfo['port'];
-        let srtp_key = videoInfo['srtp_key'];
-        let srtp_salt = videoInfo['srtp_salt'];
-        let ssrcSource = crypto.randomBytes(4);
-        ssrcSource[0] = 0;
-        let ssrc = ssrcSource.readInt32BE(0, true);
-        response['video'] = {
-            port: targetPort,
-            ssrc: ssrc,
-            srtp_key: srtp_key,
-            srtp_salt: srtp_salt,
-        };
-        sessionInfo['video_port'] = targetPort;
-        sessionInfo['video_srtp'] = Buffer.concat([srtp_key, srtp_salt]);
-        sessionInfo['video_ssrc'] = ssrc;
-    }
-    let audioInfo = request['audio'];
-    if (audioInfo) {
-        let targetPort = audioInfo['port'];
-        let srtp_key = audioInfo['srtp_key'];
-        let srtp_salt = audioInfo['srtp_salt'];
-        let ssrcSource = crypto.randomBytes(4);
-        ssrcSource[0] = 0;
-        let ssrc = ssrcSource.readInt32BE(0, true);
-        response['audio'] = {
-            port: targetPort,
-            ssrc: ssrc,
-            srtp_key: srtp_key,
-            srtp_salt: srtp_salt,
-        };
-        sessionInfo['audio_port'] = targetPort;
-        sessionInfo['audio_srtp'] = Buffer.concat([srtp_key, srtp_salt]);
-        sessionInfo['audio_ssrc'] = ssrc;
-    }
-    const networkInterfaces = os.networkInterfaces();
-    if (this.interfaceName && networkInterfaces[this.interfaceName]) {
-        const currentAddress = networkInterfaces[this.interfaceName];
-        if (currentAddress === null || currentAddress === void 0 ? void 0 : currentAddress[0]) {
-            response['address'] = {
-                address: currentAddress[0].address,
-                type: currentAddress[0].family === 'IPv4' ? 'v4' : 'v6',
-            };
-        }
-    }
-    this.pendingSessions[uuid.unparse(sessionID)] = sessionInfo;
-    callback(response);
-};
-Camera.prototype.handleStreamRequest = function (request) {
-    const sessionID = request['sessionID'];
-    const requestType = request['type'];
-    if (sessionID) {
-        let sessionIdentifier = uuid.unparse(sessionID);
-        log.debug('Request type: ' + requestType);
-        if (requestType === 'start') {
-            const sessionInfo = this.pendingSessions[sessionIdentifier];
-            if (sessionInfo) {
-                let width = 1280;
-                let height = 720;
-                let fps = this.fps || 30;
-                let vbitrate = this.maxBitrate;
-                let abitrate = 32;
-                let asamplerate = 16;
-                const vcodec = this.vcodec;
-                const acodec = this.acodec;
-                const packetsize = this.packetsize || 1316;
-                const additionalCommandline = this.additionalCommandline;
-                const mapvideo = this.mapvideo;
-                const mapaudio = this.mapaudio;
-                let videoInfo = request['video'];
-                if (videoInfo) {
-                    width = videoInfo['width'];
-                    height = videoInfo['height'];
-                    let expectedFPS = videoInfo['fps'];
-                    if (expectedFPS < fps) {
-                        fps = expectedFPS;
-                    }
-                    if (videoInfo['max_bit_rate'] < vbitrate) {
-                        vbitrate = videoInfo['max_bit_rate'];
-                    }
-                }
-                let audioInfo = request['audio'];
-                if (audioInfo) {
-                    abitrate = audioInfo['max_bit_rate'];
-                    asamplerate = audioInfo['sample_rate'];
-                }
-                let targetAddress = sessionInfo['address'];
-                let targetVideoPort = sessionInfo['video_port'];
-                let videoKey = sessionInfo['video_srtp'];
-                let videoSsrc = sessionInfo['video_ssrc'];
-                let targetAudioPort = sessionInfo['audio_port'];
-                let audioKey = sessionInfo['audio_srtp'];
-                let audioSsrc = sessionInfo['audio_ssrc'];
-                let vf = [];
-                if (this.videoFilter !== null && this.videoFilter !== '') {
-                    vf.push(this.videoFilter);
-                    if (this.hflip)
-                        vf.push('hflip');
-                    if (this.vflip)
-                        vf.push('vflip');
-                }
-                let fcmd = this.ffmpegSource;
-                let ffmpegVideoArgs = ' -map ' +
-                    mapvideo +
-                    ' -vcodec ' +
-                    vcodec +
-                    ' -pix_fmt yuv420p' +
-                    ' -r ' +
-                    fps +
-                    ' -f rawvideo' +
-                    (additionalCommandline ? ' ' + additionalCommandline : '') +
-                    (vf.length > 0 ? ' -vf ' + vf.join(',') : '') +
-                    ' -b:v ' +
-                    vbitrate +
-                    'k' +
-                    ' -bufsize ' +
-                    vbitrate +
-                    'k' +
-                    ' -maxrate ' +
-                    vbitrate +
-                    'k' +
-                    ' -payload_type 99';
-                let ffmpegVideoStream = ' -ssrc ' +
-                    videoSsrc +
-                    ' -f rtp' +
-                    ' -srtp_out_suite AES_CM_128_HMAC_SHA1_80' +
-                    ' -srtp_out_params ' +
-                    videoKey.toString('base64') +
-                    ' srtp://' +
-                    targetAddress +
-                    ':' +
-                    targetVideoPort +
-                    '?rtcpport=' +
-                    targetVideoPort +
-                    '&localrtcpport=' +
-                    targetVideoPort +
-                    '&pkt_size=' +
-                    packetsize;
-                fcmd += ffmpegVideoArgs;
-                fcmd += ffmpegVideoStream;
-                if (this.audio) {
-                    let ffmpegAudioArgs = ' -map ' +
-                        mapaudio +
-                        ' -acodec ' +
-                        acodec +
-                        ' -profile:a aac_eld' +
-                        ' -flags +global_header' +
-                        ' -f null' +
-                        ' -ar ' +
-                        asamplerate +
-                        'k' +
-                        ' -b:a ' +
-                        abitrate +
-                        'k' +
-                        ' -bufsize ' +
-                        abitrate +
-                        'k' +
-                        ' -ac 1' +
-                        ' -payload_type 110';
-                    let ffmpegAudioStream = ' -ssrc ' +
-                        audioSsrc +
-                        ' -f rtp' +
-                        ' -srtp_out_suite AES_CM_128_HMAC_SHA1_80' +
-                        ' -srtp_out_params ' +
-                        audioKey.toString('base64') +
-                        ' srtp://' +
-                        targetAddress +
-                        ':' +
-                        targetAudioPort +
-                        '?rtcpport=' +
-                        targetAudioPort +
-                        '&localrtcpport=' +
-                        targetAudioPort +
-                        '&pkt_size=' +
-                        packetsize;
-                    fcmd += ffmpegAudioArgs;
-                    fcmd += ffmpegAudioStream;
-                }
-                if (this.debug) {
-                    fcmd += ' -loglevel debug';
-                }
-                let ffmpeg = spawn(this.videoProcessor, fcmd.split(' '), {
-                    env: process.env,
-                });
-                log.debug('Start streaming video from ' +
-                    this.name +
-                    ' with ' +
-                    width +
-                    'x' +
-                    height +
-                    '@' +
-                    vbitrate +
-                    'kBit');
-                log.debug('ffmpeg ' + fcmd);
-                ffmpeg.stderr.on('data', function (data) {
-                    log.debug('ffmpeg data: ' + data.toString());
-                }.bind(this));
-                let self = this;
-                ffmpeg.on('error', function (error) {
-                    log.error('An error occurred while making stream request');
-                    log.error(util.inspect(error));
-                });
-                ffmpeg.on('close', (code) => {
-                    if (code == null || code === 0 || code === 255) {
-                        log.debug('Stopped streaming');
-                    }
-                    else {
-                        log.error('ERROR: FFmpeg exited with code ' + code);
-                        for (let i = 0; i < self.streamControllers.length; i++) {
-                            const controller = self.streamControllers[i];
-                            if (controller.sessionIdentifier === sessionID) {
-                                controller.forceStop();
-                            }
-                        }
-                    }
-                });
-                this.ongoingSessions[sessionIdentifier] = ffmpeg;
-            }
-            delete this.pendingSessions[sessionIdentifier];
-        }
-        else if (requestType === 'stop') {
-            const ffmpegProcess = this.ongoingSessions[sessionIdentifier];
-            if (ffmpegProcess) {
-                ffmpegProcess.kill('SIGTERM');
-            }
-            delete this.ongoingSessions[sessionIdentifier];
-        }
-        else if (requestType === 'reconfigure') {
-        }
-    }
-};
-Camera.prototype._createStreamControllers = function (cameraControlService, maxStreams, options) {
-    let self = this;
-    log.debug('Configuring services for Camera...');
-    self.services.push(cameraControlService);
-    log.debug('...added CameraControl Service');
-    if (self.audio) {
-        log.debug('...audio available');
-    }
-    else {
-        log.debug('...audio not available');
-    }
-    log.debug('Creating Camera Stream Controllers: ' + maxStreams + ' - Started');
-    log.debug('Camera options: ' + JSON.stringify(options));
-    for (let i = 0; i < maxStreams; i++) {
-        const streamController = new StreamController(i, options, self);
-        self.services.push(streamController.service);
-        self.streamControllers.push(streamController);
-    }
-    log.debug('Creating Camera Stream Controllers - Finished');
-};

package/build/lib/types/hap-nodejs/BonjourMulticastOptions.d.ts

@@ -1,10 +0,0 @@
-type BonjourMulticastOptions = {
-    multicast?: boolean;
-    interface?: string;
-    port?: number;
-    ip?: string;
-    ttl?: number;
-    loopback?: boolean;
-    reuseAddr?: boolean;
-};
-export default BonjourMulticastOptions;

package/build/lib/types/hap-nodejs/BonjourMulticastOptions.js

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

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

@@ -1 +0,0 @@
-export {};

package/build/lib/utils/MdnsUtils.js

@@ -1,93 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-const net = __importStar(require("net"));
-const os = __importStar(require("os"));
-const MdnsUtils = () => {
-    let availableInterfaces;
-    const checkIp = function (value) {
-        return value.length > 0 && net.isIP(value);
-    };
-    const checkInterface = function (value) {
-        if (value.length < 1) {
-            return false;
-        }
-        if (!availableInterfaces) {
-            availableInterfaces = [];
-            const networkInterfaces = os.networkInterfaces();
-            Object.keys(networkInterfaces).forEach((key) => {
-                var _a;
-                return (_a = networkInterfaces[key]) === null || _a === void 0 ? void 0 : _a.forEach((networkInterface) => availableInterfaces.push(networkInterface.address));
-            });
-        }
-        return availableInterfaces.indexOf(value) > -1;
-    };
-    const checkMulticast = function (value) {
-        return checkBoolean(value);
-    };
-    const checkPort = function (value) {
-        return value.length > 0 && checkNumber(value);
-    };
-    const checkLoopback = function (value) {
-        return checkBoolean(value);
-    };
-    const checkReuseAddr = function (value) {
-        return checkBoolean(value);
-    };
-    const checkTtl = function (value) {
-        if (value.length > 0 && checkNumber(value)) {
-            const ttlInt = parseInt(value);
-            return ttlInt >= 0 && ttlInt <= 255;
-        }
-        else
-            return false;
-    };
-    const checkBoolean = function (value) {
-        return typeof value === 'boolean';
-    };
-    const checkNumber = function (value) {
-        return !isNaN(value);
-    };
-    return {
-        checkInterface,
-        checkIp,
-        checkMulticast,
-        checkPort,
-        checkLoopback,
-        checkReuseAddr,
-        checkTtl,
-    };
-};
-module.exports = MdnsUtils;