hap-nodejs 0.12.3-beta.2 → 0.12.3-beta.21

package/dist/lib/Advertiser.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResolvedAdvertiser = exports.AvahiAdvertiser = exports.DBusInvokeError = exports.BonjourHAPAdvertiser = exports.CiaoAdvertiser = exports.AdvertiserEvent = exports.PairingFeatureFlag = exports.StatusFlag = void 0;
-var tslib_1 = require("tslib");
+const tslib_1 = require("tslib");
 // eslint-disable-next-line @typescript-eslint/triple-slash-reference
 /// <reference path="../../@types/bonjour-hap.d.ts" />
-var ciao_1 = tslib_1.__importDefault(require("@homebridge/ciao"));
-var dbus_native_1 = tslib_1.__importDefault(require("@homebridge/dbus-native"));
-var assert_1 = tslib_1.__importDefault(require("assert"));
-var bonjour_hap_1 = tslib_1.__importDefault(require("bonjour-hap"));
-var crypto_1 = tslib_1.__importDefault(require("crypto"));
-var debug_1 = tslib_1.__importDefault(require("debug"));
-var events_1 = require("events");
-var promise_utils_1 = require("./util/promise-utils");
-var debug = (0, debug_1.default)("HAP-NodeJS:Advertiser");
+const ciao_1 = tslib_1.__importDefault(require("@homebridge/ciao"));
+const dbus_native_1 = tslib_1.__importDefault(require("@homebridge/dbus-native"));
+const assert_1 = tslib_1.__importDefault(require("assert"));
+const bonjour_hap_1 = tslib_1.__importDefault(require("bonjour-hap"));
+const crypto_1 = tslib_1.__importDefault(require("crypto"));
+const debug_1 = tslib_1.__importDefault(require("debug"));
+const events_1 = require("events");
+const promise_utils_1 = require("./util/promise-utils");
+const debug = (0, debug_1.default)("HAP-NodeJS:Advertiser");
 /**
  * This enum lists all bitmasks for all known status flags.
  * When the bit for the given bitmask is set, it represents the state described by the name.
@@ -57,48 +57,49 @@ var AdvertiserEvent;
  *
  * @group Advertiser
  */
-var CiaoAdvertiser = /** @class */ (function (_super) {
-    tslib_1.__extends(CiaoAdvertiser, _super);
-    function CiaoAdvertiser(accessoryInfo, responderOptions, serviceOptions) {
-        var _this = _super.call(this) || this;
-        _this.accessoryInfo = accessoryInfo;
-        _this.setupHash = CiaoAdvertiser.computeSetupHash(accessoryInfo);
-        _this.responder = ciao_1.default.getResponder(tslib_1.__assign({}, responderOptions));
-        _this.advertisedService = _this.responder.createService(tslib_1.__assign({ name: _this.accessoryInfo.displayName, type: "hap" /* ServiceType.HAP */, txt: CiaoAdvertiser.createTxt(accessoryInfo, _this.setupHash) }, serviceOptions));
-        _this.advertisedService.on("name-change" /* ServiceEvent.NAME_CHANGED */, _this.emit.bind(_this, "updated-name" /* AdvertiserEvent.UPDATED_NAME */));
-        debug("Preparing Advertiser for '".concat(_this.accessoryInfo.displayName, "' using ciao backend!"));
-        return _this;
-    }
-    CiaoAdvertiser.prototype.initPort = function (port) {
+class CiaoAdvertiser extends events_1.EventEmitter {
+    static protocolVersion = "1.1";
+    static protocolVersionService = "1.1.0";
+    accessoryInfo;
+    setupHash;
+    responder;
+    advertisedService;
+    constructor(accessoryInfo, responderOptions, serviceOptions) {
+        super();
+        this.accessoryInfo = accessoryInfo;
+        this.setupHash = CiaoAdvertiser.computeSetupHash(accessoryInfo);
+        this.responder = ciao_1.default.getResponder({
+            ...responderOptions,
+        });
+        this.advertisedService = this.responder.createService({
+            name: this.accessoryInfo.displayName,
+            type: "hap" /* ServiceType.HAP */,
+            txt: CiaoAdvertiser.createTxt(accessoryInfo, this.setupHash),
+            // host will default now to <displayName>.local, spaces replaced with dashes
+            ...serviceOptions,
+        });
+        this.advertisedService.on("name-change" /* ServiceEvent.NAME_CHANGED */, this.emit.bind(this, "updated-name" /* AdvertiserEvent.UPDATED_NAME */));
+        debug(`Preparing Advertiser for '${this.accessoryInfo.displayName}' using ciao backend!`);
+    }
+    initPort(port) {
         this.advertisedService.updatePort(port);
-    };
-    CiaoAdvertiser.prototype.startAdvertising = function () {
-        debug("Starting to advertise '".concat(this.accessoryInfo.displayName, "' using ciao backend!"));
+    }
+    startAdvertising() {
+        debug(`Starting to advertise '${this.accessoryInfo.displayName}' using ciao backend!`);
         return this.advertisedService.advertise();
-    };
-    CiaoAdvertiser.prototype.updateAdvertisement = function (silent) {
-        var txt = CiaoAdvertiser.createTxt(this.accessoryInfo, this.setupHash);
+    }
+    updateAdvertisement(silent) {
+        const txt = CiaoAdvertiser.createTxt(this.accessoryInfo, this.setupHash);
         debug("Updating txt record (txt: %o, silent: %d)", txt, silent);
         this.advertisedService.updateTxt(txt, silent);
-    };
-    CiaoAdvertiser.prototype.destroy = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: 
-                    // advertisedService.destroy(); is called implicitly via the shutdown call
-                    return [4 /*yield*/, this.responder.shutdown()];
-                    case 1:
-                        // advertisedService.destroy(); is called implicitly via the shutdown call
-                        _a.sent();
-                        this.removeAllListeners();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    CiaoAdvertiser.createTxt = function (accessoryInfo, setupHash) {
-        var statusFlags = [];
+    }
+    async destroy() {
+        // advertisedService.destroy(); is called implicitly via the shutdown call
+        await this.responder.shutdown();
+        this.removeAllListeners();
+    }
+    static createTxt(accessoryInfo, setupHash) {
+        const statusFlags = [];
         if (!accessoryInfo.paired()) {
             statusFlags.push(1 /* StatusFlag.NOT_PAIRED */);
         }
@@ -109,103 +110,102 @@ var CiaoAdvertiser = /** @class */ (function (_super) {
             md: accessoryInfo.model, // model name
             pv: CiaoAdvertiser.protocolVersion, // protocol version
             "s#": 1, // current state number (must be 1)
-            sf: CiaoAdvertiser.sf.apply(CiaoAdvertiser, tslib_1.__spreadArray([], tslib_1.__read(statusFlags), false)), // status flags
+            sf: CiaoAdvertiser.sf(...statusFlags), // status flags
             ci: accessoryInfo.category,
             sh: setupHash,
         };
-    };
-    CiaoAdvertiser.computeSetupHash = function (accessoryInfo) {
-        var hash = crypto_1.default.createHash("sha512");
+    }
+    static computeSetupHash(accessoryInfo) {
+        const hash = crypto_1.default.createHash("sha512");
         hash.update(accessoryInfo.setupID + accessoryInfo.username.toUpperCase());
         return hash.digest().slice(0, 4).toString("base64");
-    };
-    CiaoAdvertiser.ff = function () {
-        var flags = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            flags[_i] = arguments[_i];
-        }
-        var value = 0;
-        flags.forEach(function (flag) { return value |= flag; });
+    }
+    static ff(...flags) {
+        let value = 0;
+        flags.forEach(flag => value |= flag);
         return value;
-    };
-    CiaoAdvertiser.sf = function () {
-        var flags = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            flags[_i] = arguments[_i];
-        }
-        var value = 0;
-        flags.forEach(function (flag) { return value |= flag; });
+    }
+    static sf(...flags) {
+        let value = 0;
+        flags.forEach(flag => value |= flag);
         return value;
-    };
-    CiaoAdvertiser.protocolVersion = "1.1";
-    CiaoAdvertiser.protocolVersionService = "1.1.0";
-    return CiaoAdvertiser;
-}(events_1.EventEmitter));
+    }
+}
 exports.CiaoAdvertiser = CiaoAdvertiser;
 /**
  * Advertiser base on the legacy "bonjour-hap" library.
  *
  * @group Advertiser
  */
-var BonjourHAPAdvertiser = /** @class */ (function (_super) {
-    tslib_1.__extends(BonjourHAPAdvertiser, _super);
-    function BonjourHAPAdvertiser(accessoryInfo, responderOptions, serviceOptions) {
-        var _this = _super.call(this) || this;
-        _this.destroyed = false;
-        _this.accessoryInfo = accessoryInfo;
-        _this.setupHash = CiaoAdvertiser.computeSetupHash(accessoryInfo);
-        _this.serviceOptions = serviceOptions;
-        _this.bonjour = (0, bonjour_hap_1.default)(responderOptions);
-        debug("Preparing Advertiser for '".concat(_this.accessoryInfo.displayName, "' using bonjour-hap backend!"));
-        return _this;
-    }
-    BonjourHAPAdvertiser.prototype.initPort = function (port) {
+class BonjourHAPAdvertiser extends events_1.EventEmitter {
+    accessoryInfo;
+    setupHash;
+    serviceOptions;
+    bonjour;
+    advertisement;
+    port;
+    destroyed = false;
+    constructor(accessoryInfo, serviceOptions) {
+        super();
+        this.accessoryInfo = accessoryInfo;
+        this.setupHash = CiaoAdvertiser.computeSetupHash(accessoryInfo);
+        this.serviceOptions = serviceOptions;
+        this.bonjour = (0, bonjour_hap_1.default)();
+        debug(`Preparing Advertiser for '${this.accessoryInfo.displayName}' using bonjour-hap backend!`);
+    }
+    initPort(port) {
         this.port = port;
-    };
-    BonjourHAPAdvertiser.prototype.startAdvertising = function () {
+    }
+    startAdvertising() {
         (0, assert_1.default)(!this.destroyed, "Can't advertise on a destroyed bonjour instance!");
         if (this.port == null) {
             throw new Error("Tried starting bonjour-hap advertisement without initializing port!");
         }
-        debug("Starting to advertise '".concat(this.accessoryInfo.displayName, "' using bonjour-hap backend!"));
+        debug(`Starting to advertise '${this.accessoryInfo.displayName}' using bonjour-hap backend!`);
         if (this.advertisement) {
             this.destroy();
         }
-        var hostname = this.accessoryInfo.username.replace(/:/ig, "_") + ".local";
-        this.advertisement = this.bonjour.publish(tslib_1.__assign({ name: this.accessoryInfo.displayName, type: "hap", port: this.port, txt: CiaoAdvertiser.createTxt(this.accessoryInfo, this.setupHash), host: hostname, addUnsafeServiceEnumerationRecord: true }, this.serviceOptions));
+        const hostname = this.accessoryInfo.username.replace(/:/ig, "_") + ".local";
+        this.advertisement = this.bonjour.publish({
+            name: this.accessoryInfo.displayName,
+            type: "hap",
+            port: this.port,
+            txt: CiaoAdvertiser.createTxt(this.accessoryInfo, this.setupHash),
+            host: hostname,
+            addUnsafeServiceEnumerationRecord: true,
+            ...this.serviceOptions,
+        });
         return (0, promise_utils_1.PromiseTimeout)(1);
-    };
-    BonjourHAPAdvertiser.prototype.updateAdvertisement = function (silent) {
-        var txt = CiaoAdvertiser.createTxt(this.accessoryInfo, this.setupHash);
+    }
+    updateAdvertisement(silent) {
+        const txt = CiaoAdvertiser.createTxt(this.accessoryInfo, this.setupHash);
         debug("Updating txt record (txt: %o, silent: %d)", txt, silent);
         if (this.advertisement) {
             this.advertisement.updateTxt(txt, silent);
         }
-    };
-    BonjourHAPAdvertiser.prototype.destroy = function () {
-        var _this = this;
+    }
+    destroy() {
         if (this.advertisement) {
-            this.advertisement.stop(function () {
-                _this.advertisement.destroy();
-                _this.advertisement = undefined;
-                _this.bonjour.destroy();
+            this.advertisement.stop(() => {
+                this.advertisement.destroy();
+                this.advertisement = undefined;
+                this.bonjour.destroy();
             });
         }
         else {
             this.bonjour.destroy();
         }
-    };
-    return BonjourHAPAdvertiser;
-}(events_1.EventEmitter));
+    }
+}
 exports.BonjourHAPAdvertiser = BonjourHAPAdvertiser;
 function messageBusConnectionResult(bus) {
-    return new Promise(function (resolve, reject) {
-        var errorHandler = function (error) {
+    return new Promise((resolve, reject) => {
+        const errorHandler = (error) => {
             // eslint-disable-next-line @typescript-eslint/no-use-before-define
             bus.connection.removeListener("connect", connectHandler);
             reject(error);
         };
-        var connectHandler = function () {
+        const connectHandler = () => {
             bus.connection.removeListener("error", errorHandler);
             resolve();
         };
@@ -216,30 +216,34 @@ function messageBusConnectionResult(bus) {
 /**
  * @group Advertiser
  */
-var DBusInvokeError = /** @class */ (function (_super) {
-    tslib_1.__extends(DBusInvokeError, _super);
+class DBusInvokeError extends Error {
+    errorName;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    function DBusInvokeError(errorObject) {
-        var _this = _super.call(this) || this;
-        Object.setPrototypeOf(_this, DBusInvokeError.prototype);
-        _this.name = "DBusInvokeError";
-        _this.errorName = errorObject.name;
+    constructor(errorObject) {
+        super();
+        Object.setPrototypeOf(this, DBusInvokeError.prototype);
+        this.name = "DBusInvokeError";
+        this.errorName = errorObject.name;
         if (Array.isArray(errorObject.message) && errorObject.message.length === 1) {
-            _this.message = errorObject.message[0];
+            this.message = errorObject.message[0];
         }
         else {
-            _this.message = errorObject.message.toString();
+            this.message = errorObject.message.toString();
         }
-        return _this;
     }
-    return DBusInvokeError;
-}(Error));
+}
 exports.DBusInvokeError = DBusInvokeError;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function dbusInvoke(bus, destination, path, dbusInterface, member, others) {
-    return new Promise(function (resolve, reject) {
-        var command = tslib_1.__assign({ destination: destination, path: path, interface: dbusInterface, member: member }, (others || {}));
-        bus.invoke(command, function (err, result) {
+    return new Promise((resolve, reject) => {
+        const command = {
+            destination,
+            path,
+            interface: dbusInterface,
+            member,
+            ...(others || {}),
+        };
+        bus.invoke(command, (err, result) => {
             if (err) {
                 reject(new DBusInvokeError(err));
             }
@@ -274,232 +278,167 @@ var AvahiServerState;
  *
  * @group Advertiser
  */
-var AvahiAdvertiser = /** @class */ (function (_super) {
-    tslib_1.__extends(AvahiAdvertiser, _super);
-    function AvahiAdvertiser(accessoryInfo) {
-        var _this = _super.call(this) || this;
-        _this.accessoryInfo = accessoryInfo;
-        _this.setupHash = CiaoAdvertiser.computeSetupHash(accessoryInfo);
-        debug("Preparing Advertiser for '".concat(_this.accessoryInfo.displayName, "' using Avahi backend!"));
-        _this.bus = dbus_native_1.default.systemBus();
-        _this.stateChangeHandler = _this.handleStateChangedEvent.bind(_this);
-        return _this;
-    }
-    AvahiAdvertiser.prototype.createTxt = function () {
+class AvahiAdvertiser extends events_1.EventEmitter {
+    accessoryInfo;
+    setupHash;
+    port;
+    bus;
+    avahiServerInterface;
+    path;
+    stateChangeHandler;
+    constructor(accessoryInfo) {
+        super();
+        this.accessoryInfo = accessoryInfo;
+        this.setupHash = CiaoAdvertiser.computeSetupHash(accessoryInfo);
+        debug(`Preparing Advertiser for '${this.accessoryInfo.displayName}' using Avahi backend!`);
+        this.bus = dbus_native_1.default.systemBus();
+        this.stateChangeHandler = this.handleStateChangedEvent.bind(this);
+    }
+    createTxt() {
         return Object
             .entries(CiaoAdvertiser.createTxt(this.accessoryInfo, this.setupHash))
-            .map(function (el) { return Buffer.from(el[0] + "=" + el[1]); });
-    };
-    AvahiAdvertiser.prototype.initPort = function (port) {
+            .map((el) => Buffer.from(el[0] + "=" + el[1]));
+    }
+    initPort(port) {
         this.port = port;
-    };
-    AvahiAdvertiser.prototype.startAdvertising = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, error_1;
-            return tslib_1.__generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        if (this.port == null) {
-                            throw new Error("Tried starting Avahi advertisement without initializing port!");
-                        }
-                        if (!this.bus) {
-                            throw new Error("Tried to start Avahi advertisement on a destroyed advertiser!");
-                        }
-                        debug("Starting to advertise '".concat(this.accessoryInfo.displayName, "' using Avahi backend!"));
-                        _a = this;
-                        return [4 /*yield*/, AvahiAdvertiser.avahiInvoke(this.bus, "/", "Server", "EntryGroupNew")];
-                    case 1:
-                        _a.path = (_c.sent());
-                        return [4 /*yield*/, AvahiAdvertiser.avahiInvoke(this.bus, this.path, "EntryGroup", "AddService", {
-                                body: [
-                                    -1, // interface
-                                    -1, // protocol
-                                    0, // flags
-                                    this.accessoryInfo.displayName, // name
-                                    "_hap._tcp", // type
-                                    "", // domain
-                                    "", // host
-                                    this.port, // port
-                                    this.createTxt(), // txt
-                                ],
-                                signature: "iiussssqaay",
-                            })];
-                    case 2:
-                        _c.sent();
-                        return [4 /*yield*/, AvahiAdvertiser.avahiInvoke(this.bus, this.path, "EntryGroup", "Commit")];
-                    case 3:
-                        _c.sent();
-                        _c.label = 4;
-                    case 4:
-                        _c.trys.push([4, 7, , 8]);
-                        if (!!this.avahiServerInterface) return [3 /*break*/, 6];
-                        _b = this;
-                        return [4 /*yield*/, AvahiAdvertiser.avahiInterface(this.bus, "Server")];
-                    case 5:
-                        _b.avahiServerInterface = _c.sent();
-                        this.avahiServerInterface.on("StateChanged", this.stateChangeHandler);
-                        _c.label = 6;
-                    case 6: return [3 /*break*/, 8];
-                    case 7:
-                        error_1 = _c.sent();
-                        // We have some problem on Synology https://github.com/homebridge/HAP-NodeJS/issues/993
-                        console.warn("Failed to create listener for avahi-daemon server state. The system will not be notified about restarts of avahi-daemon " +
-                            "and will therefore stay undiscoverable in those instances. Error message: " + error_1);
-                        if (error_1.stack) {
-                            debug("Detailed error: " + error_1.stack);
-                        }
-                        return [3 /*break*/, 8];
-                    case 8: return [2 /*return*/];
-                }
-            });
+    }
+    async startAdvertising() {
+        if (this.port == null) {
+            throw new Error("Tried starting Avahi advertisement without initializing port!");
+        }
+        if (!this.bus) {
+            throw new Error("Tried to start Avahi advertisement on a destroyed advertiser!");
+        }
+        debug(`Starting to advertise '${this.accessoryInfo.displayName}' using Avahi backend!`);
+        this.path = await AvahiAdvertiser.avahiInvoke(this.bus, "/", "Server", "EntryGroupNew");
+        await AvahiAdvertiser.avahiInvoke(this.bus, this.path, "EntryGroup", "AddService", {
+            body: [
+                -1, // interface
+                -1, // protocol
+                0, // flags
+                this.accessoryInfo.displayName, // name
+                "_hap._tcp", // type
+                "", // domain
+                "", // host
+                this.port, // port
+                this.createTxt(), // txt
+            ],
+            signature: "iiussssqaay",
         });
-    };
+        await AvahiAdvertiser.avahiInvoke(this.bus, this.path, "EntryGroup", "Commit");
+        try {
+            if (!this.avahiServerInterface) {
+                this.avahiServerInterface = await AvahiAdvertiser.avahiInterface(this.bus, "Server");
+                this.avahiServerInterface.on("StateChanged", this.stateChangeHandler);
+            }
+        }
+        catch (error) {
+            // We have some problem on Synology https://github.com/homebridge/HAP-NodeJS/issues/993
+            console.warn("Failed to create listener for avahi-daemon server state. The system will not be notified about restarts of avahi-daemon " +
+                "and will therefore stay undiscoverable in those instances. Error message: " + error);
+            if (error.stack) {
+                debug("Detailed error: " + error.stack);
+            }
+        }
+    }
     /**
      * Event handler for the `StateChanged` event of the `org.freedesktop.Avahi.Server` DBus interface.
      *
      * This is called once the state of the running avahi-daemon changes its running state.
      * @param state - The state the server changed into {@see AvahiServerState}.
      */
-    AvahiAdvertiser.prototype.handleStateChangedEvent = function (state) {
+    handleStateChangedEvent(state) {
         if (state === 2 /* AvahiServerState.RUNNING */ && this.path) {
             debug("Found Avahi daemon to have restarted!");
             this.startAdvertising()
-                .catch(function (reason) { return console.error("Could not (re-)create mDNS advertisement. The HAP-Server won't be discoverable: " + reason); });
-        }
-    };
-    AvahiAdvertiser.prototype.updateAdvertisement = function (silent) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var error_2;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this.bus) {
-                            throw new Error("Tried to update Avahi advertisement on a destroyed advertiser!");
-                        }
-                        if (!this.path) {
-                            debug("Tried to update advertisement without a valid `path`!");
-                            return [2 /*return*/];
-                        }
-                        debug("Updating txt record (txt: %o, silent: %d)", CiaoAdvertiser.createTxt(this.accessoryInfo, this.setupHash), silent);
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, AvahiAdvertiser.avahiInvoke(this.bus, this.path, "EntryGroup", "UpdateServiceTxt", {
-                                body: [-1, -1, 0, this.accessoryInfo.displayName, "_hap._tcp", "", this.createTxt()],
-                                signature: "iiusssaay",
-                            })];
-                    case 2:
-                        _a.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        error_2 = _a.sent();
-                        console.error("Failed to update avahi advertisement: " + error_2);
-                        return [3 /*break*/, 4];
-                    case 4: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    AvahiAdvertiser.prototype.destroy = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var error_3;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this.bus) {
-                            throw new Error("Tried to destroy Avahi advertisement on a destroyed advertiser!");
-                        }
-                        if (!this.path) return [3 /*break*/, 5];
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, AvahiAdvertiser.avahiInvoke(this.bus, this.path, "EntryGroup", "Free")];
-                    case 2:
-                        _a.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        error_3 = _a.sent();
-                        // Typically, this fails if e.g. avahi service was stopped in the meantime.
-                        debug("Destroying Avahi advertisement failed: " + error_3);
-                        return [3 /*break*/, 4];
-                    case 4:
-                        this.path = undefined;
-                        _a.label = 5;
-                    case 5:
-                        if (this.avahiServerInterface) {
-                            this.avahiServerInterface.removeListener("StateChanged", this.stateChangeHandler);
-                            this.avahiServerInterface = undefined;
-                        }
-                        this.bus.connection.stream.destroy();
-                        this.bus = undefined;
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    AvahiAdvertiser.isAvailable = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var bus, error_4, version, error_5;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        bus = dbus_native_1.default.systemBus();
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, , 9, 10]);
-                        _a.label = 2;
-                    case 2:
-                        _a.trys.push([2, 4, , 5]);
-                        return [4 /*yield*/, messageBusConnectionResult(bus)];
-                    case 3:
-                        _a.sent();
-                        return [3 /*break*/, 5];
-                    case 4:
-                        error_4 = _a.sent();
-                        debug("Avahi/DBus classified unavailable due to missing dbus interface!");
-                        return [2 /*return*/, false];
-                    case 5:
-                        _a.trys.push([5, 7, , 8]);
-                        return [4 /*yield*/, this.avahiInvoke(bus, "/", "Server", "GetVersionString")];
-                    case 6:
-                        version = _a.sent();
-                        debug("Detected Avahi over DBus interface running version '%s'.", version);
-                        return [3 /*break*/, 8];
-                    case 7:
-                        error_5 = _a.sent();
-                        debug("Avahi/DBus classified unavailable due to missing avahi interface!");
-                        return [2 /*return*/, false];
-                    case 8: return [2 /*return*/, true];
-                    case 9:
-                        bus.connection.stream.destroy();
-                        return [7 /*endfinally*/];
-                    case 10: return [2 /*return*/];
-                }
+                .catch(reason => console.error("Could not (re-)create mDNS advertisement. The HAP-Server won't be discoverable: " + reason));
+        }
+    }
+    async updateAdvertisement(silent) {
+        if (!this.bus) {
+            throw new Error("Tried to update Avahi advertisement on a destroyed advertiser!");
+        }
+        if (!this.path) {
+            debug("Tried to update advertisement without a valid `path`!");
+            return;
+        }
+        debug("Updating txt record (txt: %o, silent: %d)", CiaoAdvertiser.createTxt(this.accessoryInfo, this.setupHash), silent);
+        try {
+            await AvahiAdvertiser.avahiInvoke(this.bus, this.path, "EntryGroup", "UpdateServiceTxt", {
+                body: [-1, -1, 0, this.accessoryInfo.displayName, "_hap._tcp", "", this.createTxt()],
+                signature: "iiusssaay",
             });
-        });
-    };
+        }
+        catch (error) {
+            console.error("Failed to update avahi advertisement: " + error);
+        }
+    }
+    async destroy() {
+        if (!this.bus) {
+            throw new Error("Tried to destroy Avahi advertisement on a destroyed advertiser!");
+        }
+        if (this.path) {
+            try {
+                await AvahiAdvertiser.avahiInvoke(this.bus, this.path, "EntryGroup", "Free");
+            }
+            catch (error) {
+                // Typically, this fails if e.g. avahi service was stopped in the meantime.
+                debug("Destroying Avahi advertisement failed: " + error);
+            }
+            this.path = undefined;
+        }
+        if (this.avahiServerInterface) {
+            this.avahiServerInterface.removeListener("StateChanged", this.stateChangeHandler);
+            this.avahiServerInterface = undefined;
+        }
+        this.bus.connection.stream.destroy();
+        this.bus = undefined;
+    }
+    static async isAvailable() {
+        const bus = dbus_native_1.default.systemBus();
+        try {
+            try {
+                await messageBusConnectionResult(bus);
+            }
+            catch (error) {
+                debug("Avahi/DBus classified unavailable due to missing dbus interface!");
+                return false;
+            }
+            try {
+                const version = await this.avahiInvoke(bus, "/", "Server", "GetVersionString");
+                debug("Detected Avahi over DBus interface running version '%s'.", version);
+            }
+            catch (error) {
+                debug("Avahi/DBus classified unavailable due to missing avahi interface!");
+                return false;
+            }
+            return true;
+        }
+        finally {
+            bus.connection.stream.destroy();
+        }
+    }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    AvahiAdvertiser.avahiInvoke = function (bus, path, dbusInterface, member, others) {
-        return dbusInvoke(bus, "org.freedesktop.Avahi", path, "org.freedesktop.Avahi.".concat(dbusInterface), member, others);
-    };
-    AvahiAdvertiser.avahiInterface = function (bus, dbusInterface) {
-        return new Promise(function (resolve, reject) {
+    static avahiInvoke(bus, path, dbusInterface, member, others) {
+        return dbusInvoke(bus, "org.freedesktop.Avahi", path, `org.freedesktop.Avahi.${dbusInterface}`, member, others);
+    }
+    static avahiInterface(bus, dbusInterface) {
+        return new Promise((resolve, reject) => {
             bus
                 .getService("org.freedesktop.Avahi")
-                .getInterface("/", "org.freedesktop.Avahi." + dbusInterface, function (error, iface) {
+                .getInterface("/", "org.freedesktop.Avahi." + dbusInterface, (error, iface) => {
                 if (error || !iface) {
-                    reject(error !== null && error !== void 0 ? error : new Error("Interface not present!"));
+                    reject(error ?? new Error("Interface not present!"));
                 }
                 else {
                     resolve(iface);
                 }
             });
         });
-    };
-    return AvahiAdvertiser;
-}(events_1.EventEmitter));
+    }
+}
 exports.AvahiAdvertiser = AvahiAdvertiser;
-var RESOLVED_PERMISSIONS_ERRORS = [
+const RESOLVED_PERMISSIONS_ERRORS = [
     "org.freedesktop.DBus.Error.AccessDenied",
     "org.freedesktop.DBus.Error.AuthFailed",
     "org.freedesktop.DBus.Error.InteractiveAuthorizationRequired",
@@ -510,217 +449,146 @@ var RESOLVED_PERMISSIONS_ERRORS = [
  *
  * @group Advertiser
  */
-var ResolvedAdvertiser = /** @class */ (function (_super) {
-    tslib_1.__extends(ResolvedAdvertiser, _super);
-    function ResolvedAdvertiser(accessoryInfo) {
-        var _this = _super.call(this) || this;
-        _this.accessoryInfo = accessoryInfo;
-        _this.setupHash = CiaoAdvertiser.computeSetupHash(accessoryInfo);
-        _this.bus = dbus_native_1.default.systemBus();
-        debug("Preparing Advertiser for '".concat(_this.accessoryInfo.displayName, "' using systemd-resolved backend!"));
-        return _this;
-    }
-    ResolvedAdvertiser.prototype.createTxt = function () {
+class ResolvedAdvertiser extends events_1.EventEmitter {
+    accessoryInfo;
+    setupHash;
+    port;
+    bus;
+    path;
+    constructor(accessoryInfo) {
+        super();
+        this.accessoryInfo = accessoryInfo;
+        this.setupHash = CiaoAdvertiser.computeSetupHash(accessoryInfo);
+        this.bus = dbus_native_1.default.systemBus();
+        debug(`Preparing Advertiser for '${this.accessoryInfo.displayName}' using systemd-resolved backend!`);
+    }
+    createTxt() {
         return Object
             .entries(CiaoAdvertiser.createTxt(this.accessoryInfo, this.setupHash))
-            .map(function (el) { return [el[0].toString(), Buffer.from(el[1].toString())]; });
-    };
-    ResolvedAdvertiser.prototype.initPort = function (port) {
+            .map((el) => [el[0].toString(), Buffer.from(el[1].toString())]);
+    }
+    initPort(port) {
         this.port = port;
-    };
-    ResolvedAdvertiser.prototype.startAdvertising = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, error_6;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        if (this.port == null) {
-                            throw new Error("Tried starting systemd-resolved advertisement without initializing port!");
-                        }
-                        if (!this.bus) {
-                            throw new Error("Tried to start systemd-resolved advertisement on a destroyed advertiser!");
-                        }
-                        debug("Starting to advertise '".concat(this.accessoryInfo.displayName, "' using systemd-resolved backend!"));
-                        _b.label = 1;
-                    case 1:
-                        _b.trys.push([1, 3, , 4]);
-                        _a = this;
-                        return [4 /*yield*/, ResolvedAdvertiser.managerInvoke(this.bus, "RegisterService", {
-                                body: [
-                                    this.accessoryInfo.displayName, // name
-                                    this.accessoryInfo.displayName, // name_template
-                                    "_hap._tcp", // type
-                                    this.port, // service_port
-                                    0, // service_priority
-                                    0, // service_weight
-                                    [this.createTxt()], // txt_datas
-                                ],
-                                signature: "sssqqqaa{say}",
-                            })];
-                    case 2:
-                        _a.path = _b.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        error_6 = _b.sent();
-                        if (error_6 instanceof DBusInvokeError) {
-                            if (RESOLVED_PERMISSIONS_ERRORS.includes(error_6.errorName)) {
-                                error_6.message = "Permissions issue. See https://homebridge.io/w/mDNS-Options for more info. ".concat(error_6.message);
-                            }
-                        }
-                        throw error_6;
-                    case 4: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    ResolvedAdvertiser.prototype.updateAdvertisement = function (silent) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this.bus) {
-                            throw new Error("Tried to update systemd-resolved advertisement on a destroyed advertiser!");
-                        }
-                        debug("Updating txt record (txt: %o, silent: %d)", CiaoAdvertiser.createTxt(this.accessoryInfo, this.setupHash), silent);
-                        // Currently, systemd-resolved has no way to update an existing record.
-                        return [4 /*yield*/, this.stopAdvertising()];
-                    case 1:
-                        // Currently, systemd-resolved has no way to update an existing record.
-                        _a.sent();
-                        return [4 /*yield*/, this.startAdvertising()];
-                    case 2:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
+    }
+    async startAdvertising() {
+        if (this.port == null) {
+            throw new Error("Tried starting systemd-resolved advertisement without initializing port!");
+        }
+        if (!this.bus) {
+            throw new Error("Tried to start systemd-resolved advertisement on a destroyed advertiser!");
+        }
+        debug(`Starting to advertise '${this.accessoryInfo.displayName}' using systemd-resolved backend!`);
+        try {
+            this.path = await ResolvedAdvertiser.managerInvoke(this.bus, "RegisterService", {
+                body: [
+                    this.accessoryInfo.displayName, // name
+                    this.accessoryInfo.displayName, // name_template
+                    "_hap._tcp", // type
+                    this.port, // service_port
+                    0, // service_priority
+                    0, // service_weight
+                    [this.createTxt()], // txt_datas
+                ],
+                signature: "sssqqqaa{say}",
             });
-        });
-    };
-    ResolvedAdvertiser.prototype.stopAdvertising = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var error_7;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this.bus) {
-                            throw new Error("Tried to destroy systemd-resolved advertisement on a destroyed advertiser!");
-                        }
-                        if (!this.path) return [3 /*break*/, 5];
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, ResolvedAdvertiser.managerInvoke(this.bus, "UnregisterService", {
-                                body: [this.path],
-                                signature: "o",
-                            })];
-                    case 2:
-                        _a.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        error_7 = _a.sent();
-                        // Typically, this fails if e.g. systemd-resolved service was stopped in the meantime.
-                        debug("Destroying systemd-resolved advertisement failed: " + error_7);
-                        return [3 /*break*/, 4];
-                    case 4:
-                        this.path = undefined;
-                        _a.label = 5;
-                    case 5: return [2 /*return*/];
+        }
+        catch (error) {
+            if (error instanceof DBusInvokeError) {
+                if (RESOLVED_PERMISSIONS_ERRORS.includes(error.errorName)) {
+                    error.message = `Permissions issue. See https://homebridge.io/w/mDNS-Options for more info. ${error.message}`;
                 }
-            });
-        });
-    };
-    ResolvedAdvertiser.prototype.destroy = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this.bus) {
-                            throw new Error("Tried to destroy systemd-resolved advertisement on a destroyed advertiser!");
-                        }
-                        return [4 /*yield*/, this.stopAdvertising()];
-                    case 1:
-                        _a.sent();
-                        this.bus.connection.stream.destroy();
-                        this.bus = undefined;
-                        return [2 /*return*/];
+            }
+            throw error;
+        }
+    }
+    async updateAdvertisement(silent) {
+        if (!this.bus) {
+            throw new Error("Tried to update systemd-resolved advertisement on a destroyed advertiser!");
+        }
+        debug("Updating txt record (txt: %o, silent: %d)", CiaoAdvertiser.createTxt(this.accessoryInfo, this.setupHash), silent);
+        // Currently, systemd-resolved has no way to update an existing record.
+        await this.stopAdvertising();
+        await this.startAdvertising();
+    }
+    async stopAdvertising() {
+        if (!this.bus) {
+            throw new Error("Tried to destroy systemd-resolved advertisement on a destroyed advertiser!");
+        }
+        if (this.path) {
+            try {
+                await ResolvedAdvertiser.managerInvoke(this.bus, "UnregisterService", {
+                    body: [this.path],
+                    signature: "o",
+                });
+            }
+            catch (error) {
+                // Typically, this fails if e.g. systemd-resolved service was stopped in the meantime.
+                debug("Destroying systemd-resolved advertisement failed: " + error);
+            }
+            this.path = undefined;
+        }
+    }
+    async destroy() {
+        if (!this.bus) {
+            throw new Error("Tried to destroy systemd-resolved advertisement on a destroyed advertiser!");
+        }
+        await this.stopAdvertising();
+        this.bus.connection.stream.destroy();
+        this.bus = undefined;
+    }
+    static async isAvailable() {
+        const bus = dbus_native_1.default.systemBus();
+        try {
+            try {
+                await messageBusConnectionResult(bus);
+            }
+            catch (error) {
+                debug("systemd-resolved/DBus classified unavailable due to missing dbus interface!");
+                return false;
+            }
+            try {
+                // Ensure that systemd-resolved is accessible.
+                await this.managerInvoke(bus, "ResolveHostname", {
+                    body: [0, "127.0.0.1", 0, 0],
+                    signature: "isit",
+                });
+                debug("Detected systemd-resolved over DBus interface running version.");
+            }
+            catch (error) {
+                debug("systemd-resolved/DBus classified unavailable due to missing systemd-resolved interface!");
+                return false;
+            }
+            try {
+                const mdnsStatus = await this.resolvedInvoke(bus, "org.freedesktop.DBus.Properties", "Get", {
+                    body: ["org.freedesktop.resolve1.Manager", "MulticastDNS"],
+                    signature: "ss",
+                });
+                if (mdnsStatus[0][0].type !== "s") {
+                    throw new Error("Invalid type for MulticastDNS");
                 }
-            });
-        });
-    };
-    ResolvedAdvertiser.isAvailable = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var bus, error_8, error_9, mdnsStatus, error_10;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        bus = dbus_native_1.default.systemBus();
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, , 12, 13]);
-                        _a.label = 2;
-                    case 2:
-                        _a.trys.push([2, 4, , 5]);
-                        return [4 /*yield*/, messageBusConnectionResult(bus)];
-                    case 3:
-                        _a.sent();
-                        return [3 /*break*/, 5];
-                    case 4:
-                        error_8 = _a.sent();
-                        debug("systemd-resolved/DBus classified unavailable due to missing dbus interface!");
-                        return [2 /*return*/, false];
-                    case 5:
-                        _a.trys.push([5, 7, , 8]);
-                        // Ensure that systemd-resolved is accessible.
-                        return [4 /*yield*/, this.managerInvoke(bus, "ResolveHostname", {
-                                body: [0, "127.0.0.1", 0, 0],
-                                signature: "isit",
-                            })];
-                    case 6:
-                        // Ensure that systemd-resolved is accessible.
-                        _a.sent();
-                        debug("Detected systemd-resolved over DBus interface running version.");
-                        return [3 /*break*/, 8];
-                    case 7:
-                        error_9 = _a.sent();
-                        debug("systemd-resolved/DBus classified unavailable due to missing systemd-resolved interface!");
-                        return [2 /*return*/, false];
-                    case 8:
-                        _a.trys.push([8, 10, , 11]);
-                        return [4 /*yield*/, this.resolvedInvoke(bus, "org.freedesktop.DBus.Properties", "Get", {
-                                body: ["org.freedesktop.resolve1.Manager", "MulticastDNS"],
-                                signature: "ss",
-                            })];
-                    case 9:
-                        mdnsStatus = _a.sent();
-                        if (mdnsStatus[0][0].type !== "s") {
-                            throw new Error("Invalid type for MulticastDNS");
-                        }
-                        if (mdnsStatus[1][0] !== "yes") {
-                            debug("systemd-resolved/DBus classified unavailable because MulticastDNS is not enabled!");
-                            return [2 /*return*/, false];
-                        }
-                        return [3 /*break*/, 11];
-                    case 10:
-                        error_10 = _a.sent();
-                        debug("systemd-resolved/DBus classified unavailable due to failure checking system status: " + error_10);
-                        return [2 /*return*/, false];
-                    case 11: return [2 /*return*/, true];
-                    case 12:
-                        bus.connection.stream.destroy();
-                        return [7 /*endfinally*/];
-                    case 13: return [2 /*return*/];
+                if (mdnsStatus[1][0] !== "yes") {
+                    debug("systemd-resolved/DBus classified unavailable because MulticastDNS is not enabled!");
+                    return false;
                 }
-            });
-        });
-    };
+            }
+            catch (error) {
+                debug("systemd-resolved/DBus classified unavailable due to failure checking system status: " + error);
+                return false;
+            }
+            return true;
+        }
+        finally {
+            bus.connection.stream.destroy();
+        }
+    }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    ResolvedAdvertiser.resolvedInvoke = function (bus, dbusInterface, member, others) {
+    static resolvedInvoke(bus, dbusInterface, member, others) {
         return dbusInvoke(bus, "org.freedesktop.resolve1", "/org/freedesktop/resolve1", dbusInterface, member, others);
-    };
+    }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    ResolvedAdvertiser.managerInvoke = function (bus, member, others) {
+    static managerInvoke(bus, member, others) {
         return this.resolvedInvoke(bus, "org.freedesktop.resolve1.Manager", member, others);
-    };
-    return ResolvedAdvertiser;
-}(events_1.EventEmitter));
+    }
+}
 exports.ResolvedAdvertiser = ResolvedAdvertiser;
 //# sourceMappingURL=Advertiser.js.map