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

package/build/lib/utils/AccessoryUtils.js

@@ -1,113 +1,155 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = require("@nrchkb/logger");
-module.exports = (node) => {
-    const HapNodeJS = require('@homebridge/hap-nodejs');
-    const Accessory = HapNodeJS.Accessory;
-    const Service = HapNodeJS.Service;
-    const Characteristic = HapNodeJS.Characteristic;
-    const log = (0, logger_1.logger)('NRCHKB', 'AccessoryUtils', node.config.name, node);
-    const getOrCreate = (host, accessoryInformation, subtypeUUID) => {
-        var _a, _b, _c;
-        let accessory;
-        const services = [];
-        log.debug(`Looking for accessory with service subtype ${subtypeUUID} ...`);
-        accessory = host.bridgedAccessories.find((a) => {
-            const service = a.services.find((s) => {
-                return s.subtype === subtypeUUID;
-            });
-            return service !== undefined;
+var import_hap_nodejs = require("@homebridge/hap-nodejs");
+var import_logger = require("@nrchkb/logger");
+const accessoryCache = /* @__PURE__ */ new WeakMap();
+const buildAccessoryUtils = (node) => {
+  const { Service, Characteristic } = require("@homebridge/hap-nodejs");
+  const log = (0, import_logger.logger)("NRCHKB", "AccessoryUtils", node.config.name, node);
+  const getOrCreate = (host, accessoryInformation, subtypeUUID) => {
+    let accessory;
+    const services = [];
+    let hostCache = accessoryCache.get(host);
+    if (!hostCache) {
+      hostCache = /* @__PURE__ */ new Map();
+      accessoryCache.set(host, hostCache);
+    }
+    log.debug(
+      `Looking for accessory with service subtype ${subtypeUUID} ...`
+    );
+    if (hostCache.has(subtypeUUID)) {
+      accessory = hostCache.get(subtypeUUID);
+      log.trace(`Found accessory in cache for subtype ${subtypeUUID}`);
+    } else {
+      accessory = host.bridgedAccessories.find((a) => {
+        const service = a.services.find((s) => {
+          return s.subtype === subtypeUUID;
         });
-        if (accessory) {
-            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.SerialNumber).value !== accessoryInformation.serialNo) {
-                log.debug('... Manufacturer, Model, Name or Serial Number changed! Replacing it.');
-                accessory.services
-                    .filter((service) => service.UUID !== Service.AccessoryInformation.UUID)
-                    .forEach((service) => {
-                    accessory === null || accessory === void 0 ? void 0 : accessory.removeService(service);
-                    services.push(service);
-                });
-                host.removeBridgedAccessory(accessory, false);
-                accessory.destroy();
-                accessory = undefined;
-            }
-            else {
-                log.debug('... found it! Updating it.');
-            }
-        }
-        else {
-            log.debug(`... didn't find it. Adding new accessory with name ${accessoryInformation.name} and UUID ${accessoryInformation.UUID}`);
-        }
-        let accessoryInformationService;
-        if (!accessory) {
-            accessory = new Accessory(accessoryInformation.name, accessoryInformation.UUID);
-            services.forEach((service) => {
-                accessory === null || accessory === void 0 ? void 0 : accessory.addService(service);
-            });
-            accessoryInformationService =
-                (accessory === null || accessory === void 0 ? void 0 : accessory.getService(Service.AccessoryInformation)) ||
-                    (accessory === null || accessory === void 0 ? void 0 : accessory.addService(Service.AccessoryInformation));
-            accessoryInformationService === null || accessoryInformationService === void 0 ? void 0 : accessoryInformationService.setCharacteristic(Characteristic.Name, accessoryInformation.name).setCharacteristic(Characteristic.Manufacturer, accessoryInformation.manufacturer).setCharacteristic(Characteristic.SerialNumber, accessoryInformation.serialNo).setCharacteristic(Characteristic.Model, accessoryInformation.model);
-            const revisionRegex = /\d+\.\d+\.\d+/;
-            if ((_a = accessoryInformation.firmwareRev) === null || _a === void 0 ? void 0 : _a.match(revisionRegex)) {
-                accessoryInformationService === null || accessoryInformationService === void 0 ? void 0 : accessoryInformationService.setCharacteristic(Characteristic.FirmwareRevision, accessoryInformation.firmwareRev);
-            }
-            if ((_b = accessoryInformation.hardwareRev) === null || _b === void 0 ? void 0 : _b.match(revisionRegex)) {
-                accessoryInformationService === null || accessoryInformationService === void 0 ? void 0 : accessoryInformationService.setCharacteristic(Characteristic.HardwareRevision, accessoryInformation.hardwareRev);
-            }
-            if ((_c = accessoryInformation.softwareRev) === null || _c === void 0 ? void 0 : _c.match(revisionRegex)) {
-                accessoryInformationService === null || accessoryInformationService === void 0 ? void 0 : accessoryInformationService.setCharacteristic(Characteristic.SoftwareRevision, accessoryInformation.softwareRev);
-            }
-            host.addBridgedAccessories([accessory]);
-        }
-        else {
-            accessoryInformationService =
-                (accessory === null || accessory === void 0 ? void 0 : accessory.getService(Service.AccessoryInformation)) ||
-                    (accessory === null || accessory === void 0 ? void 0 : accessory.addService(Service.AccessoryInformation));
-        }
-        accessoryInformationService === null || accessoryInformationService === void 0 ? void 0 : accessoryInformationService.setCharacteristic(Characteristic.Identify, true);
-        log.debug(`Bridge now has ${host.bridgedAccessories.length} accessories.`);
-        return accessory;
-    };
-    const onIdentify = (paired, callback) => {
-        var _a;
-        if (paired) {
-            log.debug(`Identify called on paired Accessory ${node.accessory.displayName}`);
-        }
-        else {
-            log.debug(`Identify called on unpaired Accessory ${node.accessory.displayName}`);
-        }
-        const nodes = (_a = node.childNodes) !== null && _a !== void 0 ? _a : [];
-        for (let i = 0, len = nodes.length; i < len; i++) {
-            const topic = nodes[i].config.topic
-                ? nodes[i].config.topic
-                : nodes[i].topic_in;
-            const msg = {
-                payload: { Identify: 1 },
-                name: nodes[i].name,
-                topic: topic
-            };
-            const statusId = nodes[i].nodeStatusUtils.setStatus({
-                fill: 'yellow',
-                shape: 'dot',
-                text: 'Identify : 1'
-            });
-            setTimeout(() => {
-                nodes[i].nodeStatusUtils.clearStatus(statusId);
-            }, 3000);
-            nodes[i].send([msg, msg]);
-        }
-        callback();
-    };
-    return {
-        getOrCreate,
-        onIdentify
-    };
+        return service !== void 0;
+      });
+      if (accessory) {
+        hostCache.set(subtypeUUID, accessory);
+      }
+    }
+    if (accessory) {
+      const accessoryInformationService2 = accessory.getService(Service.AccessoryInformation) || accessory.addService(Service.AccessoryInformation);
+      if (accessoryInformationService2.getCharacteristic(
+        Characteristic.Manufacturer
+      ).value !== accessoryInformation.manufacturer || accessoryInformationService2.getCharacteristic(
+        Characteristic.Model
+      ).value !== accessoryInformation.model || accessoryInformationService2.getCharacteristic(
+        Characteristic.Name
+      ).value !== accessoryInformation.name || accessoryInformationService2.getCharacteristic(
+        Characteristic.SerialNumber
+      ).value !== accessoryInformation.serialNo) {
+        log.debug(
+          "... Manufacturer, Model, Name or Serial Number changed! Replacing it."
+        );
+        accessory.services.filter(
+          (service) => service.UUID !== Service.AccessoryInformation.UUID
+        ).forEach((service) => {
+          accessory?.removeService(service);
+          services.push(service);
+        });
+        host.removeBridgedAccessories([accessory]);
+        accessory.destroy();
+        hostCache.delete(subtypeUUID);
+        accessory = void 0;
+      } else {
+        log.debug("... found it! Updating it.");
+      }
+    } else {
+      log.debug(
+        `... didn't find it. Adding new accessory with name ${accessoryInformation.name} and UUID ${accessoryInformation.UUID}`
+      );
+    }
+    let accessoryInformationService;
+    if (!accessory) {
+      accessory = new import_hap_nodejs.Accessory(
+        accessoryInformation.name,
+        accessoryInformation.UUID
+      );
+      services.forEach((service) => {
+        accessory?.addService(service);
+      });
+      accessoryInformationService = accessory?.getService(Service.AccessoryInformation) || accessory?.addService(Service.AccessoryInformation);
+      accessoryInformationService?.setCharacteristic(
+        Characteristic.Name,
+        accessoryInformation.name
+      ).setCharacteristic(
+        Characteristic.Manufacturer,
+        accessoryInformation.manufacturer
+      ).setCharacteristic(
+        Characteristic.SerialNumber,
+        accessoryInformation.serialNo
+      ).setCharacteristic(
+        Characteristic.Model,
+        accessoryInformation.model
+      );
+      const revisionRegex = /\d+\.\d+\.\d+/;
+      if (accessoryInformation.firmwareRev?.match(revisionRegex)) {
+        accessoryInformationService?.setCharacteristic(
+          Characteristic.FirmwareRevision,
+          accessoryInformation.firmwareRev
+        );
+      }
+      if (accessoryInformation.hardwareRev?.match(revisionRegex)) {
+        accessoryInformationService?.setCharacteristic(
+          Characteristic.HardwareRevision,
+          accessoryInformation.hardwareRev
+        );
+      }
+      if (accessoryInformation.softwareRev?.match(revisionRegex)) {
+        accessoryInformationService?.setCharacteristic(
+          Characteristic.SoftwareRevision,
+          accessoryInformation.softwareRev
+        );
+      }
+      host.addBridgedAccessories([accessory]);
+    } else {
+      accessoryInformationService = accessory?.getService(Service.AccessoryInformation) || accessory?.addService(Service.AccessoryInformation);
+    }
+    accessoryInformationService?.setCharacteristic(
+      Characteristic.Identify,
+      true
+    );
+    log.debug(
+      `Bridge now has ${host.bridgedAccessories.length} accessories.`
+    );
+    return accessory;
+  };
+  const onIdentify = (paired, callback) => {
+    if (paired) {
+      log.debug(
+        `Identify called on paired Accessory ${node.accessory.displayName}`
+      );
+    } else {
+      log.debug(
+        `Identify called on unpaired Accessory ${node.accessory.displayName}`
+      );
+    }
+    const nodes = node.childNodes ?? [];
+    for (let i = 0, len = nodes.length; i < len; i++) {
+      const topic = nodes[i].config.topic ? nodes[i].config.topic : nodes[i].topic_in;
+      const msg = {
+        payload: { Identify: 1 },
+        name: nodes[i].name,
+        topic
+      };
+      const statusId = nodes[i].nodeStatusUtils.setStatus({
+        fill: "yellow",
+        shape: "dot",
+        text: "Identify : 1"
+      });
+      setTimeout(() => {
+        nodes[i].nodeStatusUtils.clearStatus(statusId);
+      }, 3e3);
+      nodes[i].send([msg, msg]);
+    }
+    callback();
+  };
+  return {
+    getOrCreate,
+    onIdentify
+  };
 };
+module.exports = buildAccessoryUtils;

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;