node-red-contrib-homekit-bridged 2.0.0-dev.5 → 2.0.0-dev.7

package/build/lib/utils/BridgeUtils.js

@@ -1,44 +1,87 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = require("@nrchkb/logger");
-const HostType_1 = __importDefault(require("../types/HostType"));
-module.exports = () => {
-    const delayedPublish = (node) => {
-        const log = (0, logger_1.logger)('NRCHKB', 'BridgeUtils', node.config.name, node);
-        if (!node.hostNode.published) {
-            if (node.publishTimers[node.hostNode.id] !== undefined) {
-                clearTimeout(node.publishTimers[node.hostNode.id]);
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var import_logger = require("@nrchkb/logger");
+var import_HostType = __toESM(require("../types/HostType"));
+const PUBLISH_CHECK_INTERVAL_MS = 250;
+const buildBridgeUtils = () => {
+  const canPublishHost = (node) => {
+    let hasPendingService = false;
+    node.RED.nodes.eachNode((currentNode) => {
+      if (hasPendingService) {
+        return;
+      }
+      if (currentNode.type !== "homekit-service" && currentNode.type !== "homekit-service2") {
+        return;
+      }
+      const serviceNode = node.RED.nodes.getNode(currentNode.id);
+      if (serviceNode?.hostNode?.id === node.hostNode.id && !serviceNode.configured) {
+        hasPendingService = true;
+      }
+    });
+    return !hasPendingService;
+  };
+  const delayedPublish = (node) => {
+    const log = (0, import_logger.logger)("NRCHKB", "BridgeUtils", node.config.name, node);
+    if (!node.hostNode.published) {
+      if (node.publishTimers[node.hostNode.id] !== void 0) {
+        clearTimeout(node.publishTimers[node.hostNode.id]);
+      }
+      const hostTypeName = node.hostNode.hostType == import_HostType.default.BRIDGE ? "Bridge" : "Standalone Accessory";
+      const tryPublish = () => {
+        try {
+          if (!node.hostNode.published) {
+            if (!canPublishHost(node)) {
+              node.publishTimers[node.hostNode.id] = setTimeout(
+                tryPublish,
+                PUBLISH_CHECK_INTERVAL_MS
+              );
+              return;
             }
-            const hostTypeName = node.hostNode.hostType == HostType_1.default.BRIDGE
-                ? 'Bridge'
-                : 'Standalone Accessory';
-            node.publishTimers[node.hostNode.id] = setTimeout(() => {
-                try {
-                    if (!node.hostNode.published) {
-                        const published = node.hostNode.publish();
-                        if (published) {
-                            log.debug(`${hostTypeName} published`);
-                        }
-                        else {
-                            log.error(`${hostTypeName} not published`);
-                        }
-                    }
-                }
-                catch (error) {
-                    log.error(`${hostTypeName} publish failed due to ${error}`);
-                    node.nodeStatusUtils.setStatus({
-                        fill: 'red',
-                        shape: 'ring',
-                        text: `Error while publishing ${hostTypeName}`
-                    });
-                }
-            }, 5000);
+            const published = node.hostNode.publish();
+            if (published) {
+              log.debug(`${hostTypeName} published`);
+            } else {
+              log.error(`${hostTypeName} not published`);
+            }
+          }
+        } catch (error) {
+          log.error(`${hostTypeName} publish failed due to ${error}`);
+          node.nodeStatusUtils.setStatus({
+            fill: "red",
+            shape: "ring",
+            text: `Error while publishing ${hostTypeName}`
+          });
         }
-    };
-    return {
-        delayedPublish: delayedPublish
-    };
+      };
+      node.publishTimers[node.hostNode.id] = setTimeout(
+        tryPublish,
+        PUBLISH_CHECK_INTERVAL_MS
+      );
+    }
+  };
+  return {
+    delayedPublish
+  };
 };
+module.exports = buildBridgeUtils;

package/build/lib/utils/CharacteristicUtils.js

@@ -1,51 +1,7 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const hap_nodejs_1 = require("@homebridge/hap-nodejs");
-const logger_1 = require("@nrchkb/logger");
-module.exports = (node) => {
-    const log = (0, logger_1.logger)('NRCHKB', 'CharacteristicUtils', node.config.name, node);
-    const ServiceUtils = require('./ServiceUtils')(node);
-    const load = (service, config) => {
-        let characteristicProperties = {};
-        if (config.characteristicProperties &&
-            config.characteristicProperties.length > 0) {
-            characteristicProperties = JSON.parse(config.characteristicProperties.replace(/\${(.*?)}/g, (_, envName) => node.RED.util.evaluateNodeProperty(envName, 'env', node, {})));
-            log.trace('Evaluating value:');
-            log.trace(config.characteristicProperties);
-            log.trace('Evaluated as:');
-            log.trace(JSON.stringify(characteristicProperties));
-            for (const key in characteristicProperties) {
-                if (!Object.hasOwn(characteristicProperties, key))
-                    continue;
-                const characteristic = service.getCharacteristic(hap_nodejs_1.Characteristic[key]);
-                if (characteristic && characteristicProperties[key]) {
-                    log.debug(`Found Characteristic Properties for ${key}`);
-                    characteristic.setProps(characteristicProperties[key]);
-                }
-            }
-        }
-        return characteristicProperties;
-    };
-    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.forEach((characteristic) => {
-            const cKey = characteristic.constructor.name;
-            supported.push(cKey);
-            characteristic.on('get', node.onCharacteristicGet);
-            characteristic.on('set', node.onCharacteristicSet);
-            characteristic.on('change', node.onCharacteristicChange);
-            if (characteristic.displayName === 'Current Temperature') {
-                characteristic.props.minValue = -100;
-            }
-        });
-        return [...new Set(supported)];
-    };
-    return {
-        load: load,
-        subscribeAndGetSupported: subscribeAndGetSupported
-    };
+const buildCharacteristicUtilsBase = require("./CharacteristicUtilsBase");
+const buildServiceUtils = require("./ServiceUtils");
+const buildCharacteristicUtils = (node) => {
+  return buildCharacteristicUtilsBase(node, buildServiceUtils, { getHandlerUsesCharacteristics: false });
 };
+module.exports = buildCharacteristicUtils;

package/build/lib/utils/CharacteristicUtils2.js

@@ -1,51 +1,7 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const hap_nodejs_1 = require("@homebridge/hap-nodejs");
-const logger_1 = require("@nrchkb/logger");
-module.exports = (node) => {
-    const log = (0, logger_1.logger)('NRCHKB', 'CharacteristicUtils', node.config.name, node);
-    const ServiceUtils = require('./ServiceUtils2')(node);
-    const load = (service, config) => {
-        let characteristicProperties = {};
-        if (config.characteristicProperties &&
-            config.characteristicProperties.length > 0) {
-            characteristicProperties = JSON.parse(config.characteristicProperties.replace(/\${(.*?)}/g, (_, envName) => node.RED.util.evaluateNodeProperty(envName, 'env', node, {})));
-            log.trace('Evaluating value:');
-            log.trace(config.characteristicProperties);
-            log.trace('Evaluated as:');
-            log.trace(JSON.stringify(characteristicProperties));
-            for (const key in characteristicProperties) {
-                if (!Object.hasOwn(characteristicProperties, key))
-                    continue;
-                const characteristic = service.getCharacteristic(hap_nodejs_1.Characteristic[key]);
-                if (characteristic && characteristicProperties[key]) {
-                    log.debug(`Found Characteristic Properties for ${key}`);
-                    characteristic.setProps(characteristicProperties[key]);
-                }
-            }
-        }
-        return characteristicProperties;
-    };
-    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.forEach((characteristic) => {
-            const cKey = characteristic.constructor.name;
-            supported.push(cKey);
-            characteristic.on('get', node.onCharacteristicGet);
-            characteristic.on('set', node.onCharacteristicSet);
-            characteristic.on('change', node.onCharacteristicChange);
-            if (characteristic.displayName === 'Current Temperature') {
-                characteristic.props.minValue = -100;
-            }
-        });
-        return [...new Set(supported)];
-    };
-    return {
-        load: load,
-        subscribeAndGetSupported: subscribeAndGetSupported
-    };
+const buildCharacteristicUtilsBase = require("./CharacteristicUtilsBase");
+const buildServiceUtils2 = require("./ServiceUtils2");
+const buildCharacteristicUtils2 = (node) => {
+  return buildCharacteristicUtilsBase(node, buildServiceUtils2, { getHandlerUsesCharacteristics: true });
 };
+module.exports = buildCharacteristicUtils2;

package/build/lib/utils/CharacteristicUtilsBase.js

@@ -0,0 +1,81 @@
+"use strict";
+var import_hap_nodejs = require("@homebridge/hap-nodejs");
+var import_logger = require("@nrchkb/logger");
+const ENV_VAR_REGEX = /\${(.*?)}/g;
+const buildCharacteristicUtilsBase = (node, serviceUtilsFactory, options) => {
+  const log = (0, import_logger.logger)("NRCHKB", "CharacteristicUtils", node.config.name, node);
+  const ServiceUtils = serviceUtilsFactory(node);
+  const load = (service, config) => {
+    let characteristicProperties = {};
+    if (config.characteristicProperties && config.characteristicProperties.length > 0) {
+      try {
+        characteristicProperties = JSON.parse(
+          config.characteristicProperties.replace(
+            ENV_VAR_REGEX,
+            (_, envName) => node.RED.util.evaluateNodeProperty(
+              envName,
+              "env",
+              node,
+              {}
+            )
+          )
+        );
+      } catch (error) {
+        log.error(
+          `Invalid characteristicProperties JSON, ignoring custom properties: ${error}`
+        );
+        node.nodeStatusUtils.setStatus({
+          fill: "red",
+          shape: "ring",
+          text: "Invalid characteristic properties"
+        });
+        return characteristicProperties;
+      }
+      log.trace("Evaluating value:");
+      log.trace(config.characteristicProperties);
+      log.trace("Evaluated as:");
+      log.trace(JSON.stringify(characteristicProperties));
+      for (const key in characteristicProperties) {
+        if (!Object.hasOwn(characteristicProperties, key)) continue;
+        const characteristic = service.getCharacteristic(
+          // @ts-expect-error
+          import_hap_nodejs.Characteristic[key]
+        );
+        if (characteristic && characteristicProperties[key]) {
+          log.debug(`Found Characteristic Properties for ${key}`);
+          characteristic.setProps(characteristicProperties[key]);
+        }
+      }
+    }
+    return characteristicProperties;
+  };
+  const subscribeAndGetSupported = (service) => {
+    const supported = /* @__PURE__ */ new Set();
+    const allCharacteristics = service.characteristics.concat(
+      service.optionalCharacteristics
+    );
+    node.onCharacteristicGet = options.getHandlerUsesCharacteristics ? ServiceUtils.onCharacteristicGet(service.characteristics) : ServiceUtils.onCharacteristicGet;
+    node.onCharacteristicSet = ServiceUtils.onCharacteristicSet(
+      service.characteristics
+    );
+    node.onCharacteristicChange = ServiceUtils.onCharacteristicChange(
+      service.characteristics
+    );
+    allCharacteristics.forEach((characteristic) => {
+      const cKey = characteristic.constructor.name;
+      supported.add(cKey);
+      characteristic.on("get", node.onCharacteristicGet);
+      characteristic.on("set", node.onCharacteristicSet);
+      characteristic.on("change", node.onCharacteristicChange);
+      if (characteristic.displayName === "Current Temperature") {
+        characteristic.props.minValue = -100;
+      }
+    });
+    return supported;
+  };
+  return {
+    load,
+    subscribeAndGetSupported
+  };
+};
+module.exports = buildCharacteristicUtilsBase;

package/build/lib/utils/NodeStatusUtils.js

@@ -1,48 +1,97 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NodeStatusUtils = void 0;
-const DEFAULT_STATUS_TYPE = 'MSG';
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var NodeStatusUtils_exports = {};
+__export(NodeStatusUtils_exports, {
+  NodeStatusUtils: () => NodeStatusUtils
+});
+module.exports = __toCommonJS(NodeStatusUtils_exports);
+const DEFAULT_STATUS_TYPE = "MSG";
+let nextStatusId = 0;
 class NodeStatusUtils {
-    constructor(node) {
-        this.node = node;
+  constructor(node) {
+    this.node = node;
+    this.pendingTimeouts = /* @__PURE__ */ new Set();
+  }
+  /**
+   * Set the status
+   * @param status - status to be displayed
+   * @param timeout - if provided will clear the status after the timeout
+   */
+  setStatus(status, timeout) {
+    this.node.status(status);
+    nextStatusId += 1;
+    const newStatusId = nextStatusId;
+    this.lastStatusId = newStatusId;
+    if (typeof status !== "string") {
+      this.lastStatusType = status.type ?? DEFAULT_STATUS_TYPE;
+    } else {
+      this.lastStatusType = DEFAULT_STATUS_TYPE;
     }
-    setStatus(status, timeout) {
-        var _a;
-        this.node.status(status);
-        const newStatusId = Date.now();
-        this.lastStatusId = newStatusId;
-        if (typeof status !== 'string') {
-            this.lastStatusType = (_a = status.type) !== null && _a !== void 0 ? _a : DEFAULT_STATUS_TYPE;
-        }
-        else {
-            this.lastStatusType = DEFAULT_STATUS_TYPE;
-        }
-        if (timeout) {
-            this.clearStatus(newStatusId, timeout);
-        }
-        return newStatusId;
+    if (timeout) {
+      this.clearStatus(newStatusId, timeout);
     }
-    clearStatusByType(type) {
-        if (this.lastStatusType === type) {
-            this.clearStatus();
-        }
+    return newStatusId;
+  }
+  /**
+   * Clear the status by type, only if last status type is the same as the type provided
+   * @param type - type of status to be cleared
+   */
+  clearStatusByType(type) {
+    if (this.lastStatusType === type) {
+      this.clearStatus();
     }
-    clearStatus(statusId, timeout) {
-        if (statusId !== undefined) {
-            if (statusId === this.lastStatusId) {
-                if (timeout) {
-                    setTimeout((nodeStatusUtil) => {
-                        nodeStatusUtil.clearStatus(statusId);
-                    }, timeout, this);
-                }
-                else {
-                    this.setStatus('');
-                }
-            }
-        }
-        else {
-            this.setStatus('');
+  }
+  /**
+   * Clear the status
+   * @param statusId - if provided will clear the status only if the statusId is the same as the last statusId
+   * @param timeout - if provided will clear the status after the timeout
+   */
+  clearStatus(statusId, timeout) {
+    if (statusId !== void 0) {
+      if (statusId === this.lastStatusId) {
+        if (timeout) {
+          const timeoutHandle = setTimeout(
+            (nodeStatusUtil) => {
+              nodeStatusUtil.pendingTimeouts.delete(timeoutHandle);
+              nodeStatusUtil.clearStatus(statusId);
+            },
+            timeout,
+            this
+          );
+          this.pendingTimeouts.add(timeoutHandle);
+        } else {
+          this.setStatus("");
         }
+      }
+    } else {
+      this.setStatus("");
     }
+  }
+  /**
+   * Clean up all pending timeouts (call on node close)
+   */
+  cleanup() {
+    this.pendingTimeouts.forEach((timeout) => clearTimeout(timeout));
+    this.pendingTimeouts.clear();
+  }
 }
-exports.NodeStatusUtils = NodeStatusUtils;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  NodeStatusUtils
+});