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

package/build/lib/HAPServiceNode2.js

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

package/build/lib/NRCHKBError.js

@@ -1,5 +1,26 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+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 NRCHKBError_exports = {};
+__export(NRCHKBError_exports, {
+  default: () => NRCHKBError_default
+});
+module.exports = __toCommonJS(NRCHKBError_exports);
 class NRCHKBError extends Error {
 }
-exports.default = NRCHKBError;
+var NRCHKBError_default = NRCHKBError;

package/build/lib/PairingQRCode.js

@@ -0,0 +1,62 @@
+"use strict";
+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 __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 __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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var PairingQRCode_exports = {};
+__export(PairingQRCode_exports, {
+  createPairingQRCodeDataURL: () => createPairingQRCodeDataURL,
+  formatPinCodeForPairing: () => formatPinCodeForPairing
+});
+module.exports = __toCommonJS(PairingQRCode_exports);
+var import_qrcode = require("homekit-code/lib/commands/qrcode/qrcode.utils");
+var import_NRCHKBError = __toESM(require("./NRCHKBError"));
+const pinCodeRegex = /^(?:\d{3}-\d{2}-\d{3}|\d{4}-\d{4})$/;
+const formatPinCodeForPairing = (pinCode) => {
+  if (!pinCode) {
+    throw new import_NRCHKBError.default("Pin code cannot be empty");
+  }
+  if (!pinCodeRegex.test(pinCode)) {
+    throw new import_NRCHKBError.default(`Invalid HomeKit pin code format: ${pinCode}`);
+  }
+  const cleanPinCode = pinCode.replace(/\D/g, "");
+  return {
+    bottom: cleanPinCode.slice(4),
+    top: cleanPinCode.slice(0, 4)
+  };
+};
+const createPairingQRCodeDataURL = async (setupUri, pinCode) => {
+  const svg = await (0, import_qrcode.composeQrCode)({
+    pairingCode: pinCode.replace(/\D/g, ""),
+    setupUri
+  });
+  return `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svg)}`;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createPairingQRCodeDataURL,
+  formatPinCodeForPairing
+});