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

package/build/lib/HAPHostNode.js

@@ -17,17 +17,16 @@ const logger_1 = require("@nrchkb/logger");
 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"));
+const HapCategories_1 = __importDefault(require("./types/hap-nodejs/HapCategories"));
 module.exports = (RED, hostType) => {
     const init = function (config) {
         var _a, _b, _c;
-        const self = this;
-        const log = (0, logger_1.logger)('NRCHKB', 'HAPHostNode', config.bridgeName, self);
-        self.hostType = hostType;
-        RED.nodes.createNode(self, config);
-        self.config = config;
-        self.name = config.bridgeName;
+        const log = (0, logger_1.logger)('NRCHKB', 'HAPHostNode', config.bridgeName, this);
+        this.hostType = hostType;
+        RED.nodes.createNode(this, config);
+        this.config = config;
+        this.name = config.bridgeName;
         if (!hostNameValidator(config.bridgeName)) {
             log.error('Host name is incorrect', false);
             return new NRCHKBError_1.default('Host name is incorrect');
@@ -35,81 +34,79 @@ module.exports = (RED, hostType) => {
         if (preload_1.default.parse(config.firmwareRev) == null) {
             config.firmwareRev = new semver_1.SemVer('0.0.0');
         }
-        self.accessoryCategory = (self.hostType == HostType_1.default.BRIDGE
+        this.accessoryCategory = (this.hostType == HostType_1.default.BRIDGE
             ? HapCategories_1.default.BRIDGE
-            : self.config.accessoryCategory);
-        self.published = false;
+            : this.config.accessoryCategory);
+        this.published = false;
         try {
-            self.bridgeUsername = macify(self.id);
+            this.bridgeUsername = macify(this.id);
         }
         catch (error) {
             log.error(error);
             return error;
         }
-        const hostUUID = hap_nodejs_1.uuid.generate(self.id);
-        const hostTypeName = self.hostType == HostType_1.default.BRIDGE ? 'Bridge' : 'Standalone Accessory';
+        const hostUUID = hap_nodejs_1.uuid.generate(this.id);
+        const hostTypeName = this.hostType == HostType_1.default.BRIDGE ? 'Bridge' : 'Standalone Accessory';
         log.debug(`Creating ${hostTypeName} with UUID ${hostUUID}`);
-        if (self.hostType == HostType_1.default.BRIDGE) {
-            self.host = new hap_nodejs_1.Bridge(self.name, hostUUID);
+        if (this.hostType == HostType_1.default.BRIDGE) {
+            this.host = new hap_nodejs_1.Bridge(this.name, hostUUID);
         }
         else {
-            self.host = new hap_nodejs_1.Accessory(self.name, hostUUID);
+            this.host = new hap_nodejs_1.Accessory(this.name, hostUUID);
         }
-        self.publish = function () {
+        this.publish = () => {
             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`);
+            if (this.hostType == HostType_1.default.BRIDGE) {
+                log.debug(`Publishing ${hostTypeName} with pin code ${this.config.pinCode} and ${this.host.bridgedAccessories.length} accessories`);
             }
             else {
-                log.debug(`Publishing ${hostTypeName} with pin code ${self.config.pinCode}`);
+                log.debug(`Publishing ${hostTypeName} with pin code ${this.config.pinCode}`);
             }
-            if (self.config.port && self.config.port == 1880) {
+            if (this.config.port === 1880) {
                 log.error(`Cannot publish on ${hostTypeName} port 1880 as it is reserved for node-red`);
-                self.published = false;
+                this.published = false;
                 return false;
             }
-            let oldPinCode = self.config.pinCode;
-            if ((oldPinCode.match(/-/g) || []).length == 1) {
+            let oldPinCode = this.config.pinCode;
+            if ((oldPinCode.match(/-/g) || []).length === 1) {
                 oldPinCode = oldPinCode.replace(/-/g, '');
                 oldPinCode = `${oldPinCode.slice(0, 3)}-${oldPinCode.slice(3, 5)}-${oldPinCode.slice(5, 8)}`;
             }
             let bind;
-            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;
+            if (((_a = this.config.bind) === null || _a === void 0 ? void 0 : _a.length) && this.config.bindType) {
+                if (this.config.bindType === 'str') {
+                    bind = this.config.bind;
                 }
-                else if (self.config.bindType == 'json') {
-                    bind = JSON.parse(self.config.bind);
+                else if (this.config.bindType === 'json') {
+                    bind = JSON.parse(this.config.bind);
                 }
             }
-            self.host.publish({
-                username: self.bridgeUsername,
-                port: self.config.port && !isNaN(self.config.port)
-                    ? self.config.port
+            this.host.publish({
+                username: this.bridgeUsername,
+                port: this.config.port && !Number.isNaN(this.config.port)
+                    ? this.config.port
                     : 0,
                 pincode: oldPinCode,
-                category: self.accessoryCategory,
+                category: this.accessoryCategory,
                 bind: bind,
-                advertiser: (_b = self.config.advertiser) !== null && _b !== void 0 ? _b : "bonjour-hap",
-            }, self.config.allowInsecureRequest);
-            self.published = true;
+                advertiser: (_b = this.config.advertiser) !== null && _b !== void 0 ? _b : "bonjour-hap"
+            }, this.config.allowInsecureRequest);
+            this.published = true;
             return true;
         };
-        self.on('close', function (removed, done) {
-            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();
-            });
-        });
-        self.host.on('identify', function (paired, callback) {
+        this.on('close', (removed, done) => __awaiter(this, void 0, void 0, function* () {
+            if (removed) {
+                log.debug('This node has been deleted');
+                yield this.host.destroy();
+            }
+            else {
+                log.debug('This node is being restarted');
+                yield this.host.unpublish();
+            }
+            this.published = false;
+            done();
+        }));
+        this.host.on('identify', (paired, callback) => {
             if (paired) {
                 log.debug(`Identify called on paired ${hostTypeName}`);
             }
@@ -118,15 +115,15 @@ module.exports = (RED, hostType) => {
             }
             callback();
         });
-        const accessoryInformationService = self.host.getService(hap_nodejs_1.Service.AccessoryInformation) ||
-            self.host.addService(hap_nodejs_1.Service.AccessoryInformation);
+        const accessoryInformationService = this.host.getService(hap_nodejs_1.Service.AccessoryInformation) ||
+            this.host.addService(hap_nodejs_1.Service.AccessoryInformation);
         accessoryInformationService
-            .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, (_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());
+            .setCharacteristic(hap_nodejs_1.Characteristic.Manufacturer, this.config.manufacturer)
+            .setCharacteristic(hap_nodejs_1.Characteristic.SerialNumber, this.config.serialNo)
+            .setCharacteristic(hap_nodejs_1.Characteristic.Model, this.config.model)
+            .setCharacteristic(hap_nodejs_1.Characteristic.FirmwareRevision, (_a = this.config.firmwareRev) === null || _a === void 0 ? void 0 : _a.toString())
+            .setCharacteristic(hap_nodejs_1.Characteristic.HardwareRevision, (_b = this.config.hardwareRev) === null || _b === void 0 ? void 0 : _b.toString())
+            .setCharacteristic(hap_nodejs_1.Characteristic.SoftwareRevision, (_c = this.config.softwareRev) === null || _c === void 0 ? void 0 : _c.toString());
     };
     const macify = (nodeId) => {
         if (nodeId) {
@@ -144,11 +141,9 @@ module.exports = (RED, hostType) => {
             throw new NRCHKBError_1.default('nodeId cannot be empty in macify process');
         }
     };
-    const hostNameValidator = function (hostName) {
-        return hostName ? /^[^.]{1,64}$/.test(hostName) : false;
-    };
+    const hostNameValidator = (hostName) => hostName ? /^[^.]{1,64}$/.test(hostName) : false;
     return {
         init,
-        macify,
+        macify
     };
 };

package/build/lib/HAPServiceNode.js

@@ -10,69 +10,66 @@ const HostType_1 = __importDefault(require("./types/HostType"));
 const NodeStatusUtils_1 = require("./utils/NodeStatusUtils");
 module.exports = (RED) => {
     const nrchkbConfigCompatibilityOverride = function () {
-        const self = this;
-        const log = (0, logger_1.logger)('NRCHKB', 'HAPServiceNode', self.config.name, self);
-        if (self.config.isParent === undefined) {
-            log.trace(`nrchkbConfigCompatibilityOverride => self.config.isParent=${self.config.isParent} value changed to true`);
-            self.config.isParent = true;
+        const log = (0, logger_1.logger)('NRCHKB', 'HAPServiceNode', this.config.name, this);
+        if (this.config.isParent === undefined) {
+            log.trace(`nrchkbConfigCompatibilityOverride => self.config.isParent=${this.config.isParent} value changed to true`);
+            this.config.isParent = true;
         }
-        if (self.config.hostType === undefined) {
-            log.trace(`nrchkbConfigCompatibilityOverride => self.config.hostType=${self.config.hostType} value changed to HostType.BRIDGE`);
-            self.config.hostType = HostType_1.default.BRIDGE;
+        if (this.config.hostType === undefined) {
+            log.trace(`nrchkbConfigCompatibilityOverride => self.config.hostType=${this.config.hostType} value changed to HostType.BRIDGE`);
+            this.config.hostType = HostType_1.default.BRIDGE;
         }
     };
     const preInit = function (config) {
-        const self = this;
-        self.nodeStatusUtils = new NodeStatusUtils_1.NodeStatusUtils(self);
-        self.config = config;
-        self.name = self.config.name;
-        const log = (0, logger_1.logger)('NRCHKB', 'HAPServiceNode', self.config.name, self);
-        self.RED = RED;
-        self.publishTimers = {};
-        nrchkbConfigCompatibilityOverride.call(self);
-        RED.nodes.createNode(self, self.config);
-        const ServiceUtils = require('./utils/ServiceUtils')(self);
+        this.nodeStatusUtils = new NodeStatusUtils_1.NodeStatusUtils(this);
+        this.config = config;
+        this.name = this.config.name;
+        const log = (0, logger_1.logger)('NRCHKB', 'HAPServiceNode', this.config.name, this);
+        this.RED = RED;
+        this.publishTimers = {};
+        nrchkbConfigCompatibilityOverride.call(this);
+        RED.nodes.createNode(this, this.config);
+        const ServiceUtils = require('./utils/ServiceUtils')(this);
         new Promise((resolve) => {
-            if (self.config.waitForSetupMsg) {
+            if (this.config.waitForSetupMsg) {
                 log.debug('Waiting for Setup message. It should be of format {"payload":{"nrchkb":{"setup":{}}}}');
-                self.setupDone = false;
-                self.nodeStatusUtils.setStatus({
+                this.setupDone = false;
+                this.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);
+                this.handleWaitForSetup = (msg) => ServiceUtils.handleWaitForSetup(this.config, msg, resolve);
+                this.on('input', this.handleWaitForSetup);
             }
             else {
-                resolve(self.config);
+                resolve(this.config);
             }
         })
             .then((newConfig) => {
-            init.call(self, newConfig);
+            init.call(this, newConfig);
         })
             .catch((error) => {
             log.error(`Error while starting Service due to ${error}`);
         });
     };
     const init = function (config) {
-        const self = this;
-        self.config = config;
-        const log = (0, logger_1.logger)('NRCHKB', 'HAPServiceNode', self.config.name, self);
-        const ServiceUtils = require('./utils/ServiceUtils')(self);
-        if (self.config.isParent) {
+        this.config = config;
+        const log = (0, logger_1.logger)('NRCHKB', 'HAPServiceNode', this.config.name, this);
+        const ServiceUtils = require('./utils/ServiceUtils')(this);
+        if (this.config.isParent) {
             log.debug('Starting Parent Service');
-            configure.call(self);
-            self.configured = true;
-            self.reachable = true;
+            configure.call(this);
+            this.configured = true;
+            this.reachable = true;
         }
         else {
             const serviceType = config.serviceName === 'CameraControl' ? 'Camera' : 'Linked';
             ServiceUtils.waitForParent()
                 .then(() => {
                 log.debug(`Starting  ${serviceType} Service`);
-                configure.call(self);
-                self.configured = true;
+                configure.call(this);
+                this.configured = true;
             })
                 .catch((error) => {
                 log.error(`Error while starting ${serviceType} Service due to ${error}`);
@@ -81,102 +78,101 @@ module.exports = (RED) => {
     };
     const configure = function () {
         var _a, _b;
-        const self = this;
-        const log = (0, logger_1.logger)('NRCHKB', 'HAPServiceNode', self.config.name, self);
-        const Utils = require('./utils')(self);
+        const log = (0, logger_1.logger)('NRCHKB', 'HAPServiceNode', this.config.name, this);
+        const Utils = require('./utils')(this);
         const AccessoryUtils = Utils.AccessoryUtils;
         const BridgeUtils = Utils.BridgeUtils;
         const CharacteristicUtils = Utils.CharacteristicUtils;
         const ServiceUtils = Utils.ServiceUtils;
         let parentNode;
-        if (self.config.isParent) {
-            const hostId = self.config.hostType == HostType_1.default.BRIDGE
-                ? self.config.bridge
-                : self.config.accessoryId;
-            self.hostNode = RED.nodes.getNode(hostId);
-            if (!self.hostNode) {
-                const message = `Host node ${self.config.hostType == HostType_1.default.BRIDGE ? 'Bridge' : 'Standalone Accessory'} ${hostId} not found`;
+        if (this.config.isParent) {
+            const hostId = this.config.hostType == HostType_1.default.BRIDGE
+                ? this.config.bridge
+                : this.config.accessoryId;
+            this.hostNode = RED.nodes.getNode(hostId);
+            if (!this.hostNode) {
+                const message = `Host node ${this.config.hostType == HostType_1.default.BRIDGE ? 'Bridge' : 'Standalone Accessory'} ${hostId} not found`;
                 log.error(message, false);
                 throw new NRCHKBError_1.default(message);
             }
-            self.childNodes = [];
-            self.childNodes.push(self);
+            this.childNodes = [];
+            this.childNodes.push(this);
         }
         else {
-            parentNode = RED.nodes.getNode(self.config.parentService);
+            parentNode = RED.nodes.getNode(this.config.parentService);
             if (!parentNode) {
                 log.error('Parent Node not assigned', false);
                 throw new NRCHKBError_1.default('Parent Node not assigned');
             }
-            self.parentNode = parentNode;
-            self.parentService = self.parentNode.service;
-            if (!self.parentService) {
+            this.parentNode = parentNode;
+            this.parentService = this.parentNode.service;
+            if (!this.parentService) {
                 log.error('Parent Service not assigned', false);
                 throw new NRCHKBError_1.default('Parent Service not assigned');
             }
-            self.hostNode = self.parentNode.hostNode;
-            (_a = self.parentNode.childNodes) === null || _a === void 0 ? void 0 : _a.push(self);
-            self.accessory = self.parentNode.accessory;
+            this.hostNode = this.parentNode.hostNode;
+            (_a = this.parentNode.childNodes) === null || _a === void 0 ? void 0 : _a.push(this);
+            this.accessory = this.parentNode.accessory;
         }
-        self.name = self.config.name;
-        if (self.hasOwnProperty('_flow') &&
-            self.hasOwnProperty('_alias') &&
-            ((_b = self._flow) === null || _b === void 0 ? void 0 : _b.hasOwnProperty('TYPE')) &&
-            self._flow.TYPE === 'subflow') {
-            self.uniqueIdentifier = self._alias + '/' + self._flow.path;
+        this.name = this.config.name;
+        if (Object.hasOwn(this, '_flow') &&
+            Object.hasOwn(this, '_alias') &&
+            (this._flow ? Object(this._flow).hasOwn('TYPE') : false) &&
+            ((_b = this._flow) === null || _b === void 0 ? void 0 : _b.TYPE) === 'subflow') {
+            this.uniqueIdentifier = `${this._alias}/${this._flow.path}`;
         }
         else {
-            self.uniqueIdentifier = self.id;
+            this.uniqueIdentifier = this.id;
         }
-        const subtypeUUID = hap_nodejs_1.uuid.generate(self.uniqueIdentifier);
-        if (self.config.hostType == HostType_1.default.BRIDGE) {
-            if (self.config.isParent) {
+        const subtypeUUID = hap_nodejs_1.uuid.generate(this.uniqueIdentifier);
+        if (this.config.hostType == HostType_1.default.BRIDGE) {
+            if (this.config.isParent) {
                 const accessoryUUID = hap_nodejs_1.uuid.generate('A' +
-                    self.uniqueIdentifier +
-                    self.name +
-                    self.config.manufacturer +
-                    self.config.serialNo +
-                    self.config.model);
-                self.accessory = AccessoryUtils.getOrCreate(self.hostNode.host, {
-                    name: self.name,
+                    this.uniqueIdentifier +
+                    this.name +
+                    this.config.manufacturer +
+                    this.config.serialNo +
+                    this.config.model);
+                this.accessory = AccessoryUtils.getOrCreate(this.hostNode.host, {
+                    name: this.name,
                     UUID: accessoryUUID,
-                    manufacturer: self.config.manufacturer,
-                    serialNo: self.config.serialNo,
-                    model: self.config.model,
-                    firmwareRev: self.config.firmwareRev,
-                    hardwareRev: self.config.hardwareRev,
-                    softwareRev: self.config.softwareRev,
+                    manufacturer: this.config.manufacturer,
+                    serialNo: this.config.serialNo,
+                    model: this.config.model,
+                    firmwareRev: this.config.firmwareRev,
+                    hardwareRev: this.config.hardwareRev,
+                    softwareRev: this.config.softwareRev
                 }, subtypeUUID);
-                self.onIdentify = AccessoryUtils.onIdentify;
-                self.accessory.on('identify', self.onIdentify);
+                this.onIdentify = AccessoryUtils.onIdentify;
+                this.accessory.on('identify', this.onIdentify);
             }
         }
         else {
             log.debug('Binding Service accessory as Standalone Accessory');
-            self.accessory = self.hostNode.host;
+            this.accessory = this.hostNode.host;
         }
-        self.service = ServiceUtils.getOrCreate(self.accessory, {
-            name: self.name,
+        this.service = ServiceUtils.getOrCreate(this.accessory, {
+            name: this.name,
             UUID: subtypeUUID,
-            serviceName: self.config.serviceName,
-            config: self.config,
-        }, self.parentService);
-        self.characteristicProperties = CharacteristicUtils.load(self.service, self.config);
+            serviceName: this.config.serviceName,
+            config: this.config
+        }, this.parentService);
+        this.characteristicProperties = CharacteristicUtils.load(this.service, this.config);
         ServiceUtils.configureAdaptiveLightning();
-        if (self.config.isParent) {
-            BridgeUtils.delayedPublish(self);
+        if (this.config.isParent) {
+            BridgeUtils.delayedPublish(this);
         }
-        self.nodeStatusUtils.setStatus({
+        this.nodeStatusUtils.setStatus({
             fill: 'yellow',
             shape: 'ring',
-            text: self.hostNode.config.pinCode,
+            text: this.hostNode.config.pinCode
         });
-        self.supported = CharacteristicUtils.subscribeAndGetSupported(self.service);
-        self.on('input', ServiceUtils.onInput);
-        self.on('close', ServiceUtils.onClose);
+        this.supported = CharacteristicUtils.subscribeAndGetSupported(this.service);
+        this.on('input', ServiceUtils.onInput);
+        this.on('close', ServiceUtils.onClose);
     };
     return {
         preInit,
-        init,
+        init
     };
 };