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

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;
                 }
@@ -111,14 +84,11 @@ module.exports = (RED, hostType) => {
             }
             self.host.publish({
                 username: self.bridgeUsername,
-                port: self.config.port && !isNaN(self.config.port)
-                    ? self.config.port
-                    : 0,
+                port: self.config.port && !isNaN(self.config.port) ? self.config.port : 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 +122,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) {
@@ -177,6 +147,6 @@ module.exports = (RED, hostType) => {
     };
     return {
         init,
-        macify,
+        macify
     };
 };

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");
@@ -39,7 +39,7 @@ module.exports = (RED) => {
                 self.nodeStatusUtils.setStatus({
                     fill: 'blue',
                     shape: 'dot',
-                    text: 'Waiting for Setup',
+                    text: 'Waiting for Setup'
                 });
                 self.handleWaitForSetup = (msg) => ServiceUtils.handleWaitForSetup(self.config, msg, resolve);
                 self.on('input', self.handleWaitForSetup);
@@ -145,7 +145,7 @@ module.exports = (RED) => {
                     model: self.config.model,
                     firmwareRev: self.config.firmwareRev,
                     hardwareRev: self.config.hardwareRev,
-                    softwareRev: self.config.softwareRev,
+                    softwareRev: self.config.softwareRev
                 }, subtypeUUID);
                 self.onIdentify = AccessoryUtils.onIdentify;
                 self.accessory.on('identify', self.onIdentify);
@@ -159,7 +159,7 @@ module.exports = (RED) => {
             name: self.name,
             UUID: subtypeUUID,
             serviceName: self.config.serviceName,
-            config: self.config,
+            config: self.config
         }, self.parentService);
         self.characteristicProperties = CharacteristicUtils.load(self.service, self.config);
         ServiceUtils.configureAdaptiveLightning();
@@ -169,7 +169,7 @@ module.exports = (RED) => {
         self.nodeStatusUtils.setStatus({
             fill: 'yellow',
             shape: 'ring',
-            text: self.hostNode.config.pinCode,
+            text: self.hostNode.config.pinCode
         });
         self.supported = CharacteristicUtils.subscribeAndGetSupported(self.service);
         self.on('input', ServiceUtils.onInput);
@@ -177,6 +177,6 @@ module.exports = (RED) => {
     };
     return {
         preInit,
-        init,
+        init
     };
 };

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");
@@ -39,7 +39,7 @@ module.exports = (RED) => {
                 self.nodeStatusUtils.setStatus({
                     fill: 'blue',
                     shape: 'dot',
-                    text: 'Waiting for Setup',
+                    text: 'Waiting for Setup'
                 });
                 self.handleWaitForSetup = (msg) => ServiceUtils.handleWaitForSetup(self.config, msg, resolve);
                 self.on('input', self.handleWaitForSetup);
@@ -145,7 +145,7 @@ module.exports = (RED) => {
                     model: self.config.model,
                     firmwareRev: self.config.firmwareRev,
                     hardwareRev: self.config.hardwareRev,
-                    softwareRev: self.config.softwareRev,
+                    softwareRev: self.config.softwareRev
                 }, subtypeUUID);
                 self.onIdentify = AccessoryUtils.onIdentify;
                 self.accessory.on('identify', self.onIdentify);
@@ -159,7 +159,7 @@ module.exports = (RED) => {
             name: self.name,
             UUID: subtypeUUID,
             serviceName: self.config.serviceName,
-            config: self.config,
+            config: self.config
         }, self.parentService);
         self.characteristicProperties = CharacteristicUtils.load(self.service, self.config);
         ServiceUtils.configureAdaptiveLightning();
@@ -169,7 +169,7 @@ module.exports = (RED) => {
         self.nodeStatusUtils.setStatus({
             fill: 'yellow',
             shape: 'ring',
-            text: self.hostNode.config.pinCode,
+            text: self.hostNode.config.pinCode
         });
         self.supported = CharacteristicUtils.subscribeAndGetSupported(self.service);
         self.on('input', ServiceUtils.onInput);
@@ -177,6 +177,6 @@ module.exports = (RED) => {
     };
     return {
         preInit,
-        init,
+        init
     };
 };

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"));
@@ -35,29 +35,32 @@ module.exports = function (RED) {
         log.debug('Initialize Service API');
         const serviceData = {
             BatteryService: {
-                nrchkbDisabledText: 'BatteryService (deprecated, replaced by Battery)',
+                nrchkbDisabledText: 'BatteryService (deprecated, replaced by Battery)'
             },
             BridgeConfiguration: {
-                nrchkbDisabledText: 'BridgeConfiguration (deprecated, unused)',
+                nrchkbDisabledText: 'BridgeConfiguration (deprecated, unused)'
             },
             BridgingState: {
-                nrchkbDisabledText: 'BridgingState (deprecated, unused)',
+                nrchkbDisabledText: 'BridgingState (deprecated, unused)'
+            },
+            CameraControl: {
+                nrchkbDisabledText: 'CameraControl (deprecated, replaced by)'
             },
             CameraEventRecordingManagement: {
-                nrchkbDisabledText: 'CameraEventRecordingManagement (deprecated, replaced by CameraRecordingManagement)',
+                nrchkbDisabledText: 'CameraEventRecordingManagement (deprecated, replaced by CameraRecordingManagement)'
             },
             Relay: {
-                nrchkbDisabledText: 'Relay (deprecated, replaced by CloudRelay)',
+                nrchkbDisabledText: 'Relay (deprecated, replaced by CloudRelay)'
             },
             Slat: {
-                nrchkbDisabledText: 'Slat (deprecated, replaced by Slats)',
+                nrchkbDisabledText: 'Slat (deprecated, replaced by Slats)'
             },
             TimeInformation: {
-                nrchkbDisabledText: 'TimeInformation (deprecated, unused)',
+                nrchkbDisabledText: 'TimeInformation (deprecated, unused)'
             },
             TunneledBTLEAccessoryService: {
-                nrchkbDisabledText: 'TunneledBTLEAccessoryService (deprecated, replaced by Tunnel)',
-            },
+                nrchkbDisabledText: 'TunneledBTLEAccessoryService (deprecated, replaced by Tunnel)'
+            }
         };
         Object.values(hap_nodejs_1.Service)
             .filter((service) => service.prototype instanceof hap_nodejs_1.Service)
@@ -125,7 +128,7 @@ module.exports = function (RED) {
             res.setHeader('Content-Type', 'application/json');
             res.json({
                 version: xyzVersion,
-                experimental,
+                experimental
             });
         });
     };
@@ -198,7 +201,7 @@ module.exports = function (RED) {
                             super(name, CustomCharacteristic.UUID, Object.assign(Object.assign({}, validatedProps), { perms: (_a = validatedProps.perms) !== null && _a !== void 0 ? _a : [
                                     "pr",
                                     "pw",
-                                    "ev",
+                                    "ev"
                                 ] }));
                             this.value = this.getDefaultValue();
                         }
@@ -206,11 +209,11 @@ module.exports = function (RED) {
                     CustomCharacteristic.UUID = UUID;
                     Object.defineProperty(CustomCharacteristic, 'name', {
                         value: key,
-                        configurable: true,
+                        configurable: true
                     });
                     Object.defineProperty(hap_nodejs_1.Characteristic, key, {
                         value: CustomCharacteristic,
-                        configurable: true,
+                        configurable: true
                     });
                     customCharacteristicKeys.push(key);
                 }
@@ -242,8 +245,7 @@ module.exports = function (RED) {
                                 if (customCharacteristicKeys.includes(key)) {
                                     const characteristic = serviceNode.service
                                         .getCharacteristic(hap_nodejs_1.Characteristic[key])
-                                        .setProps(serviceNode
-                                        .characteristicProperties[key]);
+                                        .setProps(serviceNode.characteristicProperties[key]);
                                     serviceNode.supported.push(key);
                                     characteristic.on('get', serviceNode.onCharacteristicGet);
                                     characteristic.on('set', serviceNode.onCharacteristicSet);
@@ -260,7 +262,7 @@ module.exports = function (RED) {
         RED.httpAdmin.get('/nrchkb/config', RED.auth.needsPermission('nrchkb.read'), (_req, res) => __awaiter(this, void 0, void 0, function* () {
             res.setHeader('Content-Type', 'application/json');
             res.json({
-                customCharacteristics: yield getCustomCharacteristics(),
+                customCharacteristics: yield getCustomCharacteristics()
             });
         }));
         RED.httpAdmin.post('/nrchkb/config', RED.auth.needsPermission('nrchkb.write'), (req, res) => __awaiter(this, void 0, void 0, function* () {
@@ -301,6 +303,6 @@ module.exports = function (RED) {
     };
     return {
         init,
-        stringifyVersion,
+        stringifyVersion
     };
 };

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/hap/eve-app/EveCharacteristics.js

@@ -11,42 +11,42 @@ const EveCharacteristics = [
         name: 'Eve-Volt',
         format: "float",
         perms: ["pr"],
-        description: 'Volt (V) value. Used by Eve.app.',
+        description: 'Volt (V) value. Used by Eve.app.'
     },
     {
         UUID: 'E863F126-079E-48FF-8F27-9C2605A29F52',
         name: 'Eve-Ampere',
         format: "float",
         perms: ["pr"],
-        description: 'Ampere (A) value. Used by Eve.app.',
+        description: 'Ampere (A) value. Used by Eve.app.'
     },
     {
         UUID: 'E863F10D-079E-48FF-8F27-9C2605A29F52',
         name: 'Eve-Watt',
         format: "float",
         perms: ["pr"],
-        description: 'Watt (W) value. Used by Eve.app, reported as "Consumption".',
+        description: 'Watt (W) value. Used by Eve.app, reported as "Consumption".'
     },
     {
         UUID: 'E863F10C-079E-48FF-8F27-9C2605A29F52',
         name: 'Eve-Kilowatt-hour',
         format: "float",
         perms: ["pr"],
-        description: 'Kilowatt-hour (kWh) value. Used by Eve.app, reported as Total Consumption.',
+        description: 'Kilowatt-hour (kWh) value. Used by Eve.app, reported as Total Consumption.'
     },
     {
         UUID: 'E863F110-079E-48FF-8F27-9C2605A29F52',
         name: 'Eve-Volt-Ampere',
         format: "uint16",
         perms: ["pr"],
-        description: 'Volt-Ampere (VA) value. Used by Eve.app.',
-    },
+        description: 'Volt-Ampere (VA) value. Used by Eve.app.'
+    }
 ];
 class EveS2R1 extends HAPCharacteristic_1.default {
     constructor() {
         super('Eve-S2R1', EveS2R1.UUID, {
             format: "data",
-            perms: ["pr", "ev", "hd"],
+            perms: ["pr", "ev", "hd"]
         });
     }
 }
@@ -57,7 +57,7 @@ class EveS2R2 extends HAPCharacteristic_1.default {
     constructor() {
         super('Eve-S2R2', EveS2R2.UUID, {
             format: "data",
-            perms: ["pr", "ev", "hd"],
+            perms: ["pr", "ev", "hd"]
         });
     }
 }
@@ -68,7 +68,7 @@ class EveS2W1 extends HAPCharacteristic_1.default {
     constructor() {
         super('Eve-S2W1', EveS2W1.UUID, {
             format: "data",
-            perms: ["pw", "hd"],
+            perms: ["pw", "hd"]
         });
     }
 }
@@ -79,7 +79,7 @@ class EveS2W2 extends HAPCharacteristic_1.default {
     constructor() {
         super('Eve-S2W2', EveS2W2.UUID, {
             format: "data",
-            perms: ["pw", "hd"],
+            perms: ["pw", "hd"]
         });
     }
 }

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;
@@ -21,8 +21,10 @@ module.exports = function (node) {
             const accessoryInformationService = accessory.getService(Service.AccessoryInformation) ||
                 accessory.addService(Service.AccessoryInformation);
             if (accessoryInformationService.getCharacteristic(Characteristic.Manufacturer).value !== accessoryInformation.manufacturer ||
-                accessoryInformationService.getCharacteristic(Characteristic.Model).value !== accessoryInformation.model ||
-                accessoryInformationService.getCharacteristic(Characteristic.Name).value !== accessoryInformation.name ||
+                accessoryInformationService.getCharacteristic(Characteristic.Model)
+                    .value !== accessoryInformation.model ||
+                accessoryInformationService.getCharacteristic(Characteristic.Name)
+                    .value !== accessoryInformation.name ||
                 accessoryInformationService.getCharacteristic(Characteristic.SerialNumber).value !== accessoryInformation.serialNo) {
                 log.debug('... Manufacturer, Model, Name or Serial Number changed! Replacing it.');
                 accessory.services
@@ -92,12 +94,12 @@ module.exports = function (node) {
             const msg = {
                 payload: { Identify: 1 },
                 name: nodes[i].name,
-                topic: topic,
+                topic: topic
             };
             const statusId = nodes[i].nodeStatusUtils.setStatus({
                 fill: 'yellow',
                 shape: 'dot',
-                text: 'Identify : 1',
+                text: 'Identify : 1'
             });
             setTimeout(function () {
                 nodes[i].nodeStatusUtils.clearStatus(statusId);
@@ -108,6 +110,6 @@ module.exports = function (node) {
     };
     return {
         getOrCreate,
-        onIdentify,
+        onIdentify
     };
 };

package/build/lib/utils/BridgeUtils.js

@@ -32,13 +32,13 @@ module.exports = function () {
                     node.nodeStatusUtils.setStatus({
                         fill: 'red',
                         shape: 'ring',
-                        text: 'Error while publishing ' + hostTypeName,
+                        text: 'Error while publishing ' + hostTypeName
                     });
                 }
             }, 5000);
         }
     };
     return {
-        delayedPublish: delayedPublish,
+        delayedPublish: delayedPublish
     };
 };

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);
@@ -46,6 +46,6 @@ module.exports = function (node) {
     };
     return {
         load: load,
-        subscribeAndGetSupported: subscribeAndGetSupported,
+        subscribeAndGetSupported: subscribeAndGetSupported
     };
 };

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);
@@ -46,6 +46,6 @@ module.exports = function (node) {
     };
     return {
         load: load,
-        subscribeAndGetSupported: subscribeAndGetSupported,
+        subscribeAndGetSupported: subscribeAndGetSupported
     };
 };