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

package/build/lib/HAPHostNode.js

@@ -1,149 +1,191 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-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 semver_1 = require("semver");
-const preload_1 = __importDefault(require("semver/preload"));
-const NRCHKBError_1 = __importDefault(require("./NRCHKBError"));
-const HostType_1 = __importDefault(require("./types/HostType"));
-const HapCategories_1 = __importDefault(require("./types/hap-nodejs/HapCategories"));
+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_semver = require("semver");
+var import_preload = __toESM(require("semver/preload"));
+var import_NRCHKBError = __toESM(require("./NRCHKBError"));
+var import_HostType = __toESM(require("./types/HostType"));
+var import_HapCategories = __toESM(require("./types/hap-nodejs/HapCategories"));
 module.exports = (RED, hostType) => {
-    const init = function (config) {
-        var _a, _b, _c;
-        const log = (0, logger_1.logger)('NRCHKB', 'HAPHostNode', config.bridgeName, this);
-        this.hostType = hostType;
-        RED.nodes.createNode(this, config);
-        this.config = config;
-        this.name = config.bridgeName;
-        if (!hostNameValidator(config.bridgeName)) {
-            log.error('Host name is incorrect', false);
-            return new NRCHKBError_1.default('Host name is incorrect');
-        }
-        if (preload_1.default.parse(config.firmwareRev) == null) {
-            config.firmwareRev = new semver_1.SemVer('0.0.0');
-        }
-        this.accessoryCategory = (this.hostType == HostType_1.default.BRIDGE
-            ? HapCategories_1.default.BRIDGE
-            : this.config.accessoryCategory);
+  const normalizePort = (port) => {
+    if (port === void 0 || port === null || port === "") {
+      return 0;
+    }
+    const normalizedPort = Number(port);
+    return Number.isNaN(normalizedPort) ? 0 : normalizedPort;
+  };
+  const init = function(config) {
+    const log = (0, import_logger.logger)("NRCHKB", "HAPHostNode", config.bridgeName, this);
+    this.hostType = hostType;
+    RED.nodes.createNode(this, config);
+    this.config = config;
+    this.name = config.bridgeName;
+    if (!hostNameValidator(config.bridgeName)) {
+      log.error("Host name is incorrect", false);
+      return new import_NRCHKBError.default("Host name is incorrect");
+    }
+    if (import_preload.default.parse(config.firmwareRev) == null) {
+      config.firmwareRev = new import_semver.SemVer("0.0.0");
+    }
+    if (!config.bind?.length && config.customMdnsConfig) {
+      log.error(
+        "Custom mDNS configuration is deprecated and ignored by HAP-NodeJS 2.x. Use Bind and Advertiser instead."
+      );
+    }
+    this.accessoryCategory = this.hostType == import_HostType.default.BRIDGE ? import_HapCategories.default.BRIDGE : this.config.accessoryCategory;
+    this.published = false;
+    this.paired = false;
+    try {
+      this.bridgeUsername = macify(this.id);
+    } catch (error) {
+      log.error(error);
+      return error;
+    }
+    const hostUUID = import_hap_nodejs.uuid.generate(this.id);
+    const hostTypeName = this.hostType == import_HostType.default.BRIDGE ? "Bridge" : "Standalone Accessory";
+    log.debug(`Creating ${hostTypeName} with UUID ${hostUUID}`);
+    if (this.hostType == import_HostType.default.BRIDGE) {
+      this.host = new import_hap_nodejs.Bridge(this.name, hostUUID);
+    } else {
+      this.host = new import_hap_nodejs.Accessory(this.name, hostUUID);
+    }
+    this.publish = () => {
+      if (this.hostType == import_HostType.default.BRIDGE) {
+        log.debug(
+          `Publishing ${hostTypeName} with pin code ${this.config.pinCode} and ${this.host.bridgedAccessories.length} accessories`
+        );
+      } else {
+        log.debug(
+          `Publishing ${hostTypeName} with pin code ${this.config.pinCode}`
+        );
+      }
+      const port = normalizePort(this.config.port);
+      if (port === 1880) {
+        log.error(
+          `Cannot publish on ${hostTypeName} port 1880 as it is reserved for node-red`
+        );
         this.published = false;
-        try {
-            this.bridgeUsername = macify(this.id);
-        }
-        catch (error) {
-            log.error(error);
-            return error;
-        }
-        const hostUUID = hap_nodejs_1.uuid.generate(this.id);
-        const hostTypeName = this.hostType == HostType_1.default.BRIDGE ? 'Bridge' : 'Standalone Accessory';
-        log.debug(`Creating ${hostTypeName} with UUID ${hostUUID}`);
-        if (this.hostType == HostType_1.default.BRIDGE) {
-            this.host = new hap_nodejs_1.Bridge(this.name, hostUUID);
-        }
-        else {
-            this.host = new hap_nodejs_1.Accessory(this.name, hostUUID);
-        }
-        this.publish = () => {
-            var _a, _b;
-            if (this.hostType == HostType_1.default.BRIDGE) {
-                log.debug(`Publishing ${hostTypeName} with pin code ${this.config.pinCode} and ${this.host.bridgedAccessories.length} accessories`);
-            }
-            else {
-                log.debug(`Publishing ${hostTypeName} with pin code ${this.config.pinCode}`);
-            }
-            if (this.config.port === 1880) {
-                log.error(`Cannot publish on ${hostTypeName} port 1880 as it is reserved for node-red`);
-                this.published = false;
-                return false;
-            }
-            let oldPinCode = this.config.pinCode;
-            if ((oldPinCode.match(/-/g) || []).length === 1) {
-                oldPinCode = oldPinCode.replace(/-/g, '');
-                oldPinCode = `${oldPinCode.slice(0, 3)}-${oldPinCode.slice(3, 5)}-${oldPinCode.slice(5, 8)}`;
-            }
-            let bind;
-            if (((_a = this.config.bind) === null || _a === void 0 ? void 0 : _a.length) && this.config.bindType) {
-                if (this.config.bindType === 'str') {
-                    bind = this.config.bind;
-                }
-                else if (this.config.bindType === 'json') {
-                    bind = JSON.parse(this.config.bind);
-                }
-            }
-            this.host.publish({
-                username: this.bridgeUsername,
-                port: this.config.port && !Number.isNaN(this.config.port)
-                    ? this.config.port
-                    : 0,
-                pincode: oldPinCode,
-                category: this.accessoryCategory,
-                bind: bind,
-                advertiser: (_b = this.config.advertiser) !== null && _b !== void 0 ? _b : "bonjour-hap"
-            }, this.config.allowInsecureRequest);
-            this.published = true;
-            return true;
-        };
-        this.on('close', (removed, done) => __awaiter(this, void 0, void 0, function* () {
-            if (removed) {
-                log.debug('This node has been deleted');
-                yield this.host.destroy();
-            }
-            else {
-                log.debug('This node is being restarted');
-                yield this.host.unpublish();
-            }
+        return false;
+      }
+      let oldPinCode = this.config.pinCode;
+      if ((oldPinCode.match(/-/g) || []).length === 1) {
+        oldPinCode = oldPinCode.replace(/-/g, "");
+        oldPinCode = `${oldPinCode.slice(0, 3)}-${oldPinCode.slice(3, 5)}-${oldPinCode.slice(5, 8)}`;
+      }
+      let bind;
+      if (this.config.bind?.length && this.config.bindType) {
+        if (this.config.bindType === "str") {
+          bind = this.config.bind;
+        } else if (this.config.bindType === "json") {
+          try {
+            bind = JSON.parse(this.config.bind);
+          } catch (error) {
+            log.error(`Invalid bind JSON: ${error}`);
             this.published = false;
-            done();
-        }));
-        this.host.on('identify', (paired, callback) => {
-            if (paired) {
-                log.debug(`Identify called on paired ${hostTypeName}`);
-            }
-            else {
-                log.debug(`Identify called on unpaired ${hostTypeName}`);
-            }
-            callback();
-        });
-        const accessoryInformationService = this.host.getService(hap_nodejs_1.Service.AccessoryInformation) ||
-            this.host.addService(hap_nodejs_1.Service.AccessoryInformation);
-        accessoryInformationService
-            .setCharacteristic(hap_nodejs_1.Characteristic.Manufacturer, this.config.manufacturer)
-            .setCharacteristic(hap_nodejs_1.Characteristic.SerialNumber, this.config.serialNo)
-            .setCharacteristic(hap_nodejs_1.Characteristic.Model, this.config.model)
-            .setCharacteristic(hap_nodejs_1.Characteristic.FirmwareRevision, (_a = this.config.firmwareRev) === null || _a === void 0 ? void 0 : _a.toString())
-            .setCharacteristic(hap_nodejs_1.Characteristic.HardwareRevision, (_b = this.config.hardwareRev) === null || _b === void 0 ? void 0 : _b.toString())
-            .setCharacteristic(hap_nodejs_1.Characteristic.SoftwareRevision, (_c = this.config.softwareRev) === null || _c === void 0 ? void 0 : _c.toString());
-    };
-    const macify = (nodeId) => {
-        if (nodeId) {
-            const noDecimalStr = nodeId.replace('.', '');
-            const paddedStr = noDecimalStr.padEnd(12, '0');
-            const match = paddedStr.match(/.{1,2}/g);
-            if (match) {
-                return match.join(':').substr(0, 17).toUpperCase();
-            }
-            else {
-                throw new NRCHKBError_1.default(`match failed in macify process for padded string ${paddedStr}`);
-            }
-        }
-        else {
-            throw new NRCHKBError_1.default('nodeId cannot be empty in macify process');
+            return false;
+          }
         }
+      }
+      this.host.publish(
+        {
+          username: this.bridgeUsername,
+          port,
+          pincode: oldPinCode,
+          category: this.accessoryCategory,
+          bind,
+          advertiser: this.config.advertiser ?? import_hap_nodejs.MDNSAdvertiser.BONJOUR
+        },
+        this.config.allowInsecureRequest
+      );
+      this.published = true;
+      this.paired = !!this.host._accessoryInfo?.paired();
+      return true;
     };
-    const hostNameValidator = (hostName) => hostName ? /^[^.]{1,64}$/.test(hostName) : false;
-    return {
-        init,
-        macify
-    };
+    this.on("close", async (removed, done) => {
+      if (removed) {
+        log.debug("This node has been deleted");
+        await this.host.destroy();
+      } else {
+        log.debug("This node is being restarted");
+        await this.host.unpublish();
+      }
+      this.published = false;
+      this.paired = false;
+      done();
+    });
+    this.host.on("identify", (paired, callback) => {
+      if (paired) {
+        log.debug(`Identify called on paired ${hostTypeName}`);
+      } else {
+        log.debug(`Identify called on unpaired ${hostTypeName}`);
+      }
+      callback();
+    });
+    this.host.on("paired", () => {
+      this.paired = true;
+    });
+    this.host.on("unpaired", () => {
+      this.paired = false;
+    });
+    const accessoryInformationService = this.host.getService(import_hap_nodejs.Service.AccessoryInformation) || this.host.addService(import_hap_nodejs.Service.AccessoryInformation);
+    accessoryInformationService.setCharacteristic(
+      import_hap_nodejs.Characteristic.Manufacturer,
+      this.config.manufacturer
+    ).setCharacteristic(
+      import_hap_nodejs.Characteristic.SerialNumber,
+      this.config.serialNo
+    ).setCharacteristic(import_hap_nodejs.Characteristic.Model, this.config.model).setCharacteristic(
+      import_hap_nodejs.Characteristic.FirmwareRevision,
+      this.config.firmwareRev?.toString()
+    ).setCharacteristic(
+      import_hap_nodejs.Characteristic.HardwareRevision,
+      this.config.hardwareRev?.toString()
+    ).setCharacteristic(
+      import_hap_nodejs.Characteristic.SoftwareRevision,
+      this.config.softwareRev?.toString()
+    );
+  };
+  const macify = (nodeId) => {
+    if (nodeId) {
+      const noDecimalStr = nodeId.replace(/\./g, "");
+      const paddedStr = noDecimalStr.padEnd(12, "0");
+      const match = paddedStr.match(/.{1,2}/g);
+      if (match) {
+        return match.join(":").slice(0, 17).toUpperCase();
+      } else {
+        throw new import_NRCHKBError.default(
+          `match failed in macify process for padded string ${paddedStr}`
+        );
+      }
+    } else {
+      throw new import_NRCHKBError.default("nodeId cannot be empty in macify process");
+    }
+  };
+  const hostNameValidator = (hostName) => hostName ? /^[^.]{1,64}$/.test(hostName) : false;
+  return {
+    init,
+    macify
+  };
 };