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

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 = {};
@@ -55,7 +54,7 @@ module.exports = function (node) {
                 username: connection.username,
                 remoteAddress: connection.remoteAddress,
                 localAddress: connection.localAddress,
-                httpPort: connection.remotePort,
+                httpPort: connection.remotePort
             };
             hap.context = {};
         }
@@ -98,7 +97,7 @@ module.exports = function (node) {
                 fill: 'red',
                 shape: 'ring',
                 text: 'Not reachable',
-                type: 'NO_RESPONSE',
+                type: 'NO_RESPONSE'
             }));
         }
         else {
@@ -106,15 +105,13 @@ module.exports = function (node) {
             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'));
             (_e = node.parentNode) === null || _e === void 0 ? void 0 : _e.nodeStatusUtils.clearStatusByType('NO_RESPONSE');
         }
         log.debug(`${node.name} received ${key} : ${newValue}`);
-        if (connection ||
-            context ||
-            node.hostNode.config.allowMessagePassthrough) {
+        if (connection || context || node.hostNode.config.allowMessagePassthrough) {
             if (outputNumber === 0) {
                 node.send(msg);
             }
@@ -137,7 +134,7 @@ module.exports = function (node) {
         catch (_) { }
         onValueChange.call(this, allCharacteristics, 1, {
             newValue,
-            context,
+            context
         }, connection);
     };
     const onCharacteristicChange = (allCharacteristics) => function (change) {
@@ -149,7 +146,7 @@ module.exports = function (node) {
             onValueChange.call(this, allCharacteristics, 0, {
                 oldValue,
                 newValue,
-                context,
+                context
             }, originator);
         }
     };
@@ -198,7 +195,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 +263,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 {
@@ -286,7 +282,7 @@ module.exports = function (node) {
             node.nodeStatusUtils.setStatus({
                 fill: 'blue',
                 shape: 'dot',
-                text: 'Waiting for Parent Service',
+                text: 'Waiting for Parent Service'
             });
             const checkAndWait = () => {
                 const parentNode = node.RED.nodes.getNode(node.config.parentService);
@@ -331,9 +327,8 @@ module.exports = function (node) {
                         : 1,
                     customTemperatureAdjustment: node.config
                         .adaptiveLightingOptionsCustomTemperatureAdjustment
-                        ? +node.config
-                            .adaptiveLightingOptionsCustomTemperatureAdjustment
-                        : undefined,
+                        ? +node.config.adaptiveLightingOptionsCustomTemperatureAdjustment
+                        : undefined
                 };
                 log.trace(`Configuring Adaptive Lighting with options: ${options}`);
                 const adaptiveLightingController = new hap_nodejs_1.AdaptiveLightingController(node.service, options);
@@ -344,24 +339,24 @@ module.exports = function (node) {
                         transitionCurve: adaptiveLightingController.getAdaptiveLightingTransitionCurve(),
                         brightnessAdjustmentRange: adaptiveLightingController.getAdaptiveLightingBrightnessMultiplierRange(),
                         updateInterval: adaptiveLightingController.getAdaptiveLightingUpdateInterval(),
-                        notifyIntervalThreshold: adaptiveLightingController.getAdaptiveLightingNotifyIntervalThreshold(),
+                        notifyIntervalThreshold: adaptiveLightingController.getAdaptiveLightingNotifyIntervalThreshold()
                     };
                     node.send({
                         payload: {
                             AdaptiveLightingController: {
                                 event: 'update',
-                                data: activeAdaptiveLightingTransition,
-                            },
-                        },
+                                data: activeAdaptiveLightingTransition
+                            }
+                        }
                     });
                 });
                 adaptiveLightingController.on('disable', () => {
                     node.send({
                         payload: {
                             AdaptiveLightingController: {
-                                event: 'disable',
-                            },
-                        },
+                                event: 'disable'
+                            }
+                        }
                     });
                 });
                 node.accessory.configureController(adaptiveLightingController);
@@ -381,6 +376,6 @@ module.exports = function (node) {
         onClose,
         waitForParent,
         handleWaitForSetup,
-        configureAdaptiveLightning,
+        configureAdaptiveLightning
     };
 };

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;
@@ -21,7 +20,7 @@ module.exports = function (node) {
         log.debug(`${eventObject.name} event, oldValue: ${oldValue}, newValue: ${newValue}, connection ${connection === null || connection === void 0 ? void 0 : connection.sessionID}`);
         const msg = {
             name: node.name,
-            topic: node.config.topic ? node.config.topic : node.topic_in,
+            topic: node.config.topic ? node.config.topic : node.topic_in
         };
         msg.payload = {};
         msg.hap = {
@@ -31,7 +30,7 @@ module.exports = function (node) {
                 allChars[cKey] = singleChar.value;
                 return allChars;
             }, {}),
-            oldValue,
+            oldValue
         };
         const key = this.constructor.name;
         msg.hap.reachable = (_a = node.reachable) !== null && _a !== void 0 ? _a : (_b = node.parentNode) === null || _b === void 0 ? void 0 : _b.reachable;
@@ -41,7 +40,7 @@ module.exports = function (node) {
                 fill: 'red',
                 shape: 'ring',
                 text: 'Not reachable',
-                type: 'NO_RESPONSE',
+                type: 'NO_RESPONSE'
             }));
         }
         else {
@@ -49,7 +48,7 @@ module.exports = function (node) {
             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'));
             (_e = node.parentNode) === null || _e === void 0 ? void 0 : _e.nodeStatusUtils.clearStatusByType('NO_RESPONSE');
@@ -61,7 +60,7 @@ module.exports = function (node) {
                 username: connection.username,
                 remoteAddress: connection.remoteAddress,
                 localAddress: connection.localAddress,
-                httpPort: connection.remotePort,
+                httpPort: connection.remotePort
             };
         }
         log.debug(`${node.name} received ${eventObject.name} ${key}: ${newValue}`);
@@ -85,18 +84,18 @@ module.exports = function (node) {
             }
             output.call(characteristic, allCharacteristics, {
                 name: "get",
-                context: { key: this.displayName },
+                context: { key: this.displayName }
             }, { oldValue, newValue }, connection);
         };
         if (node.config.useEventCallback) {
             const callbackID = Storage_1.Storage.saveCallback({
                 event: "get",
-                callback: delayedCallback,
+                callback: delayedCallback
             });
             log.debug(`Registered callback ${callbackID} for Characteristic ${characteristic.displayName}`);
             output.call(this, allCharacteristics, {
                 name: "get",
-                context: { callbackID, key: this.displayName },
+                context: { callbackID, key: this.displayName }
             }, { oldValue }, connection);
         }
         else {
@@ -115,7 +114,7 @@ module.exports = function (node) {
         catch (_) { }
         output.call(this, allCharacteristics, {
             name: "set",
-            context: { key: this.displayName },
+            context: { key: this.displayName }
         }, { newValue }, connection);
     };
     const onCharacteristicChange = (allCharacteristics) => function (change) {
@@ -123,7 +122,7 @@ module.exports = function (node) {
         if (oldValue != newValue) {
             output.call(this, allCharacteristics, {
                 name: "change",
-                context: { reason, key: this.displayName },
+                context: { reason, key: this.displayName }
             }, { oldValue, newValue, context }, originator);
         }
     };
@@ -154,8 +153,7 @@ module.exports = function (node) {
         Object.keys(msg.payload).map((key) => {
             var _a, _b, _c, _d, _e;
             if (node.supported.indexOf(key) < 0) {
-                if (node.config.useEventCallback &&
-                    Storage_1.Storage.uuid4Validate(key)) {
+                if (node.config.useEventCallback && Storage_1.Storage.uuid4Validate(key)) {
                     const callbackID = key;
                     const callbackValue = (_a = msg.payload) === null || _a === void 0 ? void 0 : _a[key];
                     const eventCallback = Storage_1.Storage.loadCallback(callbackID);
@@ -185,7 +183,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 +251,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 {
@@ -273,7 +270,7 @@ module.exports = function (node) {
             node.nodeStatusUtils.setStatus({
                 fill: 'blue',
                 shape: 'dot',
-                text: 'Waiting for Parent Service',
+                text: 'Waiting for Parent Service'
             });
             const checkAndWait = () => {
                 const parentNode = node.RED.nodes.getNode(node.config.parentService);
@@ -315,6 +312,6 @@ module.exports = function (node) {
         onClose,
         waitForParent,
         handleWaitForSetup,
-        configureAdaptiveLightning: ServiceUtilsLegacy.configureAdaptiveLightning,
+        configureAdaptiveLightning: ServiceUtilsLegacy.configureAdaptiveLightning
     };
 };

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,
+        CharacteristicUtils
     };
 };

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) => {
@@ -22,18 +22,18 @@ module.exports = (RED) => {
                 self.nodeStatusUtils.setStatus({
                     fill: 'green',
                     shape: 'dot',
-                    text: 'Done',
+                    text: 'Done'
                 }, 3000);
                 const serializedService = hap_nodejs_1.Service.serialize(self.serviceNode.service);
                 self.send({
-                    payload: serializedService,
+                    payload: serializedService
                 });
             }
             else {
                 self.nodeStatusUtils.setStatus({
                     fill: 'red',
                     shape: 'dot',
-                    text: 'Check your config',
+                    text: 'Check your config'
                 });
             }
         });