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

package/build/lib/utils/CharacteristicUtils.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const hap_nodejs_1 = require("@homebridge/hap-nodejs");
 const logger_1 = require("@nrchkb/logger");
-module.exports = function (node) {
+module.exports = (node) => {
     const log = (0, logger_1.logger)('NRCHKB', 'CharacteristicUtils', node.config.name, node);
     const ServiceUtils = require('./ServiceUtils')(node);
-    const load = function (service, config) {
+    const load = (service, config) => {
         let characteristicProperties = {};
         if (config.characteristicProperties &&
             config.characteristicProperties.length > 0) {
@@ -15,7 +15,7 @@ module.exports = function (node) {
             log.trace('Evaluated as:');
             log.trace(JSON.stringify(characteristicProperties));
             for (const key in characteristicProperties) {
-                if (!characteristicProperties.hasOwnProperty(key))
+                if (!Object.hasOwn(characteristicProperties, key))
                     continue;
                 const characteristic = service.getCharacteristic(hap_nodejs_1.Characteristic[key]);
                 if (characteristic && characteristicProperties[key]) {
@@ -26,13 +26,13 @@ module.exports = function (node) {
         }
         return characteristicProperties;
     };
-    const subscribeAndGetSupported = function (service) {
+    const subscribeAndGetSupported = (service) => {
         const supported = [];
         const allCharacteristics = service.characteristics.concat(service.optionalCharacteristics);
         node.onCharacteristicGet = ServiceUtils.onCharacteristicGet;
         node.onCharacteristicSet = ServiceUtils.onCharacteristicSet(service.characteristics);
         node.onCharacteristicChange = ServiceUtils.onCharacteristicChange(service.characteristics);
-        allCharacteristics.map((characteristic) => {
+        allCharacteristics.forEach((characteristic) => {
             const cKey = characteristic.constructor.name;
             supported.push(cKey);
             characteristic.on('get', node.onCharacteristicGet);

package/build/lib/utils/CharacteristicUtils2.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const hap_nodejs_1 = require("@homebridge/hap-nodejs");
 const logger_1 = require("@nrchkb/logger");
-module.exports = function (node) {
+module.exports = (node) => {
     const log = (0, logger_1.logger)('NRCHKB', 'CharacteristicUtils', node.config.name, node);
     const ServiceUtils = require('./ServiceUtils2')(node);
-    const load = function (service, config) {
+    const load = (service, config) => {
         let characteristicProperties = {};
         if (config.characteristicProperties &&
             config.characteristicProperties.length > 0) {
@@ -15,7 +15,7 @@ module.exports = function (node) {
             log.trace('Evaluated as:');
             log.trace(JSON.stringify(characteristicProperties));
             for (const key in characteristicProperties) {
-                if (!characteristicProperties.hasOwnProperty(key))
+                if (!Object.hasOwn(characteristicProperties, key))
                     continue;
                 const characteristic = service.getCharacteristic(hap_nodejs_1.Characteristic[key]);
                 if (characteristic && characteristicProperties[key]) {
@@ -26,13 +26,13 @@ module.exports = function (node) {
         }
         return characteristicProperties;
     };
-    const subscribeAndGetSupported = function (service) {
+    const subscribeAndGetSupported = (service) => {
         const supported = [];
         const allCharacteristics = service.characteristics.concat(service.optionalCharacteristics);
         node.onCharacteristicGet = ServiceUtils.onCharacteristicGet(service.characteristics);
         node.onCharacteristicSet = ServiceUtils.onCharacteristicSet(service.characteristics);
         node.onCharacteristicChange = ServiceUtils.onCharacteristicChange(service.characteristics);
-        allCharacteristics.map((characteristic) => {
+        allCharacteristics.forEach((characteristic) => {
             const cKey = characteristic.constructor.name;
             supported.push(cKey);
             characteristic.on('get', node.onCharacteristicGet);

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

@@ -1,5 +1,5 @@
-import { NodeStatus } from '@node-red/registry';
-import NodeType from '../types/NodeType';
+import type { NodeStatus } from '@node-red/registry';
+import type NodeType from '../types/NodeType';
 type StatusType = 'NO_RESPONSE' | 'MSG';
 type NodeStatusWithType = NodeStatus & {
     type?: StatusType;

package/build/lib/utils/NodeStatusUtils.js

@@ -9,7 +9,7 @@ class NodeStatusUtils {
     setStatus(status, timeout) {
         var _a;
         this.node.status(status);
-        const newStatusId = new Date().getTime();
+        const newStatusId = Date.now();
         this.lastStatusId = newStatusId;
         if (typeof status !== 'string') {
             this.lastStatusType = (_a = status.type) !== null && _a !== void 0 ? _a : DEFAULT_STATUS_TYPE;
@@ -31,7 +31,7 @@ class NodeStatusUtils {
         if (statusId !== undefined) {
             if (statusId === this.lastStatusId) {
                 if (timeout) {
-                    setTimeout(function (nodeStatusUtil) {
+                    setTimeout((nodeStatusUtil) => {
                         nodeStatusUtil.clearStatus(statusId);
                     }, timeout, this);
                 }

package/build/lib/utils/ServiceUtils.js

@@ -40,7 +40,7 @@ const util = __importStar(require("node:util"));
 const hap_nodejs_1 = require("@homebridge/hap-nodejs");
 const logger_1 = require("@nrchkb/logger");
 const NRCHKBError_1 = __importDefault(require("../NRCHKBError"));
-module.exports = function (node) {
+module.exports = (node) => {
     const log = (0, logger_1.logger)('NRCHKB', 'ServiceUtils', node.config.name, node);
     const HapNodeJS = require('@homebridge/hap-nodejs');
     const Service = HapNodeJS.Service;
@@ -93,21 +93,25 @@ module.exports = function (node) {
         msg.hap.reachable = (_a = node.reachable) !== null && _a !== void 0 ? _a : (_b = node.parentNode) === null || _b === void 0 ? void 0 : _b.reachable;
         if (msg.hap.reachable === false) {
             ;
-            [node, ...((_c = node.childNodes) !== null && _c !== void 0 ? _c : [])].forEach((n) => n.nodeStatusUtils.setStatus({
-                fill: 'red',
-                shape: 'ring',
-                text: 'Not reachable',
-                type: 'NO_RESPONSE'
-            }));
+            [node, ...((_c = node.childNodes) !== null && _c !== void 0 ? _c : [])].forEach((n) => {
+                n.nodeStatusUtils.setStatus({
+                    fill: 'red',
+                    shape: 'ring',
+                    text: 'Not reachable',
+                    type: 'NO_RESPONSE'
+                });
+            });
         }
         else {
             msg.hap.newValue = newValue;
             node.nodeStatusUtils.setStatus({
                 fill: 'yellow',
                 shape: 'dot',
-                text: key + ': ' + newValue
+                text: `${key}: ${newValue}`
             }, 3000);
-            (_d = node.childNodes) === null || _d === void 0 ? void 0 : _d.forEach((n) => n.nodeStatusUtils.clearStatusByType('NO_RESPONSE'));
+            (_d = node.childNodes) === null || _d === void 0 ? void 0 : _d.forEach((n) => {
+                n.nodeStatusUtils.clearStatusByType('NO_RESPONSE');
+            });
             (_e = node.parentNode) === null || _e === void 0 ? void 0 : _e.nodeStatusUtils.clearStatusByType('NO_RESPONSE');
         }
         log.debug(`${node.name} received ${key} : ${newValue}`);
@@ -142,7 +146,7 @@ module.exports = function (node) {
         const { oldValue, newValue, context, originator, reason } = change;
         log.debug(`onCharacteristicChange with reason: ${reason}, oldValue: ${oldValue}, newValue: ${newValue}, reachability is ${((_a = node.parentNode) !== null && _a !== void 0 ? _a : node).reachable} 
             with context ${util.inspect(context)} on connection ${originator === null || originator === void 0 ? void 0 : originator.sessionID}`);
-        if (oldValue != newValue) {
+        if (oldValue !== newValue) {
             onValueChange.call(this, allCharacteristics, 0, {
                 oldValue,
                 newValue,
@@ -150,7 +154,7 @@ module.exports = function (node) {
             }, originator);
         }
     };
-    const onInput = function (msg) {
+    const onInput = (msg) => {
         var _a, _b;
         if (msg.payload) {
             const type = typeof msg.payload;
@@ -174,7 +178,7 @@ module.exports = function (node) {
             delete msg.payload.Context;
         }
         node.topic_in = (_b = msg.topic) !== null && _b !== void 0 ? _b : '';
-        Object.keys(msg.payload).map((key) => {
+        Object.keys(msg.payload).forEach((key) => {
             var _a, _b, _c, _d;
             if (node.supported.indexOf(key) < 0) {
                 if (key === 'AdaptiveLightingController' &&
@@ -203,9 +207,9 @@ module.exports = function (node) {
             }
         });
     };
-    const onClose = function (removed, done) {
+    const onClose = (removed, done) => {
         const characteristics = node.service.characteristics.concat(node.service.optionalCharacteristics);
-        characteristics.forEach(function (characteristic) {
+        characteristics.forEach((characteristic) => {
             characteristic.removeListener('get', node.onCharacteristicGet);
             characteristic.removeListener('set', node.onCharacteristicSet);
             characteristic.removeListener('change', node.onCharacteristicChange);
@@ -225,7 +229,7 @@ module.exports = function (node) {
         }
         done();
     };
-    const getOrCreate = function (accessory, serviceInformation, parentService) {
+    const getOrCreate = (accessory, serviceInformation, parentService) => {
         const newService = new Service[serviceInformation.serviceName](serviceInformation.name, serviceInformation.UUID);
         log.debug(`Looking for service with UUID ${serviceInformation.UUID} ...`);
         let service = accessory.services.find((service) => {
@@ -263,7 +267,7 @@ module.exports = function (node) {
         }
         return service;
     };
-    const configureCameraSource = function (_accessory, _service, config) {
+    const configureCameraSource = (_accessory, _service, config) => {
         if (config.cameraConfigSource) {
             log.debug('Configuring Camera Source');
             if (!config.cameraConfigVideoProcessor) {
@@ -286,7 +290,7 @@ module.exports = function (node) {
             });
             const checkAndWait = () => {
                 const parentNode = node.RED.nodes.getNode(node.config.parentService);
-                if (parentNode && parentNode.configured) {
+                if (parentNode === null || parentNode === void 0 ? void 0 : parentNode.configured) {
                     resolve(parentNode);
                 }
                 else {
@@ -303,9 +307,9 @@ module.exports = function (node) {
         if (node.setupDone) {
             return;
         }
-        if (msg.hasOwnProperty('payload') &&
-            msg.payload.hasOwnProperty('nrchkb') &&
-            msg.payload.nrchkb.hasOwnProperty('setup')) {
+        if (Object.hasOwn(msg, 'payload') &&
+            Object.hasOwn(msg.payload, 'nrchkb') &&
+            Object.hasOwn(msg.payload.nrchkb, 'setup')) {
             node.setupDone = true;
             const newConfig = Object.assign(Object.assign({}, config), msg.payload.nrchkb.setup);
             node.removeListener('input', node.handleWaitForSetup);

package/build/lib/utils/ServiceUtils2.js

@@ -7,7 +7,7 @@ const hap_nodejs_1 = require("@homebridge/hap-nodejs");
 const logger_1 = require("@nrchkb/logger");
 const NRCHKBError_1 = __importDefault(require("../NRCHKBError"));
 const Storage_1 = require("../Storage");
-module.exports = function (node) {
+module.exports = (node) => {
     const log = (0, logger_1.logger)('NRCHKB', 'ServiceUtils2', node.config.name, node);
     const ServiceUtilsLegacy = require('./ServiceUtils')(node);
     const HapNodeJS = require('@homebridge/hap-nodejs');
@@ -36,21 +36,25 @@ module.exports = function (node) {
         msg.hap.reachable = (_a = node.reachable) !== null && _a !== void 0 ? _a : (_b = node.parentNode) === null || _b === void 0 ? void 0 : _b.reachable;
         if (msg.hap.reachable === false) {
             ;
-            [node, ...((_c = node.childNodes) !== null && _c !== void 0 ? _c : [])].forEach((n) => n.nodeStatusUtils.setStatus({
-                fill: 'red',
-                shape: 'ring',
-                text: 'Not reachable',
-                type: 'NO_RESPONSE'
-            }));
+            [node, ...((_c = node.childNodes) !== null && _c !== void 0 ? _c : [])].forEach((n) => {
+                n.nodeStatusUtils.setStatus({
+                    fill: 'red',
+                    shape: 'ring',
+                    text: 'Not reachable',
+                    type: 'NO_RESPONSE'
+                });
+            });
         }
         else {
             msg.hap.newValue = newValue;
             node.nodeStatusUtils.setStatus({
                 fill: 'yellow',
                 shape: 'dot',
-                text: `[${eventObject.name}] ${key}${newValue != undefined ? `: ${newValue}` : ''}`
+                text: `[${eventObject.name}] ${key}${newValue !== undefined ? `: ${newValue}` : ''}`
             }, 3000);
-            (_d = node.childNodes) === null || _d === void 0 ? void 0 : _d.forEach((n) => n.nodeStatusUtils.clearStatusByType('NO_RESPONSE'));
+            (_d = node.childNodes) === null || _d === void 0 ? void 0 : _d.forEach((n) => {
+                n.nodeStatusUtils.clearStatusByType('NO_RESPONSE');
+            });
             (_e = node.parentNode) === null || _e === void 0 ? void 0 : _e.nodeStatusUtils.clearStatusByType('NO_RESPONSE');
         }
         msg.payload[key] = newValue;
@@ -69,11 +73,10 @@ module.exports = function (node) {
         }
     };
     const onCharacteristicGet = (allCharacteristics) => function (callback, _context, connection) {
-        const characteristic = this;
-        const oldValue = characteristic.value;
+        const oldValue = this.value;
         const delayedCallback = (value) => {
             var _a;
-            const newValue = value !== null && value !== void 0 ? value : characteristic.value;
+            const newValue = value !== null && value !== void 0 ? value : this.value;
             if (callback) {
                 try {
                     callback(((_a = node.parentNode) !== null && _a !== void 0 ? _a : node).reachable
@@ -82,7 +85,7 @@ module.exports = function (node) {
                 }
                 catch (_) { }
             }
-            output.call(characteristic, allCharacteristics, {
+            output.call(this, allCharacteristics, {
                 name: "get",
                 context: { key: this.displayName }
             }, { oldValue, newValue }, connection);
@@ -92,7 +95,7 @@ module.exports = function (node) {
                 event: "get",
                 callback: delayedCallback
             });
-            log.debug(`Registered callback ${callbackID} for Characteristic ${characteristic.displayName}`);
+            log.debug(`Registered callback ${callbackID} for Characteristic ${this.displayName}`);
             output.call(this, allCharacteristics, {
                 name: "get",
                 context: { callbackID, key: this.displayName }
@@ -119,14 +122,14 @@ module.exports = function (node) {
     };
     const onCharacteristicChange = (allCharacteristics) => function (change) {
         const { oldValue, newValue, context, originator, reason } = change;
-        if (oldValue != newValue) {
+        if (oldValue !== newValue) {
             output.call(this, allCharacteristics, {
                 name: "change",
                 context: { reason, key: this.displayName }
             }, { oldValue, newValue, context }, originator);
         }
     };
-    const onInput = function (msg) {
+    const onInput = (msg) => {
         var _a, _b;
         if (msg.payload) {
             const type = typeof msg.payload;
@@ -150,7 +153,7 @@ module.exports = function (node) {
             delete msg.payload.Context;
         }
         node.topic_in = (_b = msg.topic) !== null && _b !== void 0 ? _b : '';
-        Object.keys(msg.payload).map((key) => {
+        Object.keys(msg.payload).forEach((key) => {
             var _a, _b, _c, _d, _e;
             if (node.supported.indexOf(key) < 0) {
                 if (node.config.useEventCallback && Storage_1.Storage.uuid4Validate(key)) {
@@ -191,9 +194,9 @@ module.exports = function (node) {
             }
         });
     };
-    const onClose = function (removed, done) {
+    const onClose = (removed, done) => {
         const characteristics = node.service.characteristics.concat(node.service.optionalCharacteristics);
-        characteristics.forEach(function (characteristic) {
+        characteristics.forEach((characteristic) => {
             characteristic.removeListener('get', node.onCharacteristicGet);
             characteristic.removeListener('set', node.onCharacteristicSet);
             characteristic.removeListener('change', node.onCharacteristicChange);
@@ -213,7 +216,7 @@ module.exports = function (node) {
         }
         done();
     };
-    const getOrCreate = function (accessory, serviceInformation, parentService) {
+    const getOrCreate = (accessory, serviceInformation, parentService) => {
         const newService = new Service[serviceInformation.serviceName](serviceInformation.name, serviceInformation.UUID);
         log.debug(`Looking for service with UUID ${serviceInformation.UUID} ...`);
         let service = accessory.services.find((service) => {
@@ -251,7 +254,7 @@ module.exports = function (node) {
         }
         return service;
     };
-    const configureCameraSource = function (_accessory, _service, config) {
+    const configureCameraSource = (_accessory, _service, config) => {
         if (config.cameraConfigSource) {
             log.debug('Configuring Camera Source');
             if (!config.cameraConfigVideoProcessor) {
@@ -274,7 +277,7 @@ module.exports = function (node) {
             });
             const checkAndWait = () => {
                 const parentNode = node.RED.nodes.getNode(node.config.parentService);
-                if (parentNode && parentNode.configured) {
+                if (parentNode === null || parentNode === void 0 ? void 0 : parentNode.configured) {
                     resolve(parentNode);
                 }
                 else {
@@ -291,9 +294,9 @@ module.exports = function (node) {
         if (node.setupDone) {
             return;
         }
-        if (msg.hasOwnProperty('payload') &&
-            msg.payload.hasOwnProperty('nrchkb') &&
-            msg.payload.nrchkb.hasOwnProperty('setup')) {
+        if (Object.hasOwn(msg, 'payload') &&
+            Object.hasOwn(msg.payload, 'nrchkb') &&
+            Object.hasOwn(msg.payload.nrchkb, 'setup')) {
             node.setupDone = true;
             const newConfig = Object.assign(Object.assign({}, config), msg.payload.nrchkb.setup);
             node.removeListener('input', node.handleWaitForSetup);

package/build/lib/utils/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-module.exports = function (node) {
+module.exports = (node) => {
     const ServiceUtils = require('./ServiceUtils')(node);
     const BridgeUtils = require('./BridgeUtils')();
     const AccessoryUtils = require('./AccessoryUtils')(node);

package/build/nodes/nrchkb.js

@@ -36,9 +36,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const path = __importStar(require("node:path"));
 const hap_nodejs_1 = require("@homebridge/hap-nodejs");
 const logger_1 = require("@nrchkb/logger");
-const path = __importStar(require("path"));
 const semver_1 = __importDefault(require("semver"));
 const Storage_1 = require("../lib/Storage");
 (0, logger_1.loggerSetup)({ timestampEnabled: 'NRCHKB' });
@@ -68,7 +68,7 @@ module.exports = (RED) => {
     }
     else {
         log.error('RED settings not available');
-        rootFolder = path.join(require('os').homedir(), '.node-red');
+        rootFolder = path.join(require('node:os').homedir(), '.node-red');
     }
     Storage_1.Storage.init(rootFolder, 'nrchkb').then(() => {
         log.debug(`nrchkb storage path set to ${Storage_1.Storage.storagePath()}`);

package/build/nodes/status.js

@@ -7,38 +7,37 @@ const log = (0, logger_1.logger)('NRCHKB', 'HAPStatusNode');
 module.exports = (RED) => {
     log.debug('Registering homekit-status type');
     RED.nodes.registerType('homekit-status', function (config) {
-        const self = this;
-        self.config = config;
-        RED.nodes.createNode(self, config);
-        self.nodeStatusUtils = new NodeStatusUtils_1.NodeStatusUtils(self);
+        this.config = config;
+        RED.nodes.createNode(this, config);
+        this.nodeStatusUtils = new NodeStatusUtils_1.NodeStatusUtils(this);
         try {
-            self.serviceNode = RED.nodes.getNode(self.config.serviceNodeId);
+            this.serviceNode = RED.nodes.getNode(this.config.serviceNodeId);
         }
         catch (error) {
             log.error(error);
         }
-        self.on('input', (_) => {
-            if (self.serviceNode) {
-                self.nodeStatusUtils.setStatus({
+        this.on('input', (_) => {
+            if (this.serviceNode) {
+                this.nodeStatusUtils.setStatus({
                     fill: 'green',
                     shape: 'dot',
                     text: 'Done'
                 }, 3000);
-                const serializedService = hap_nodejs_1.Service.serialize(self.serviceNode.service);
-                self.send({
+                const serializedService = hap_nodejs_1.Service.serialize(this.serviceNode.service);
+                this.send({
                     payload: serializedService
                 });
             }
             else {
-                self.nodeStatusUtils.setStatus({
+                this.nodeStatusUtils.setStatus({
                     fill: 'red',
                     shape: 'dot',
                     text: 'Check your config'
                 });
             }
         });
-        self.on('close', (_, done) => {
-            self.serviceNode = undefined;
+        this.on('close', (_, done) => {
+            this.serviceNode = undefined;
             done();
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-homekit-bridged",
-  "version": "2.0.0-dev.1",
+  "version": "2.0.0-dev.2",
   "description": "Node-RED nodes to simulate Apple HomeKit devices.",
   "main": "build/nodes/nrchkb.js",
   "scripts": {
@@ -8,7 +8,8 @@
     "clean": "del-cli \"build/lib\" \"build/**/*.js\"",
     "test": "vitest run",
     "test:watch": "vitest",
-    "format": "biome format --write",
+    "format": "npx @biomejs/biome check --write",
+    "lint": "npx @biomejs/biome check",
     "prepare": "husky install"
   },
   "repository": {