hap-nodejs 1.0.0-beta.8 → 1.0.1-beta.0

package/dist/lib/Accessory.js

@@ -1,29 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Accessory = exports.AccessoryEventTypes = exports.MDNSAdvertiser = exports.CharacteristicWarningType = exports.Categories = void 0;
-var tslib_1 = require("tslib");
-var assert_1 = tslib_1.__importDefault(require("assert"));
-var crypto_1 = tslib_1.__importDefault(require("crypto"));
-var debug_1 = tslib_1.__importDefault(require("debug"));
-var events_1 = require("events");
-var net_1 = tslib_1.__importDefault(require("net"));
-var Advertiser_1 = require("./Advertiser");
+const tslib_1 = require("tslib");
+const assert_1 = tslib_1.__importDefault(require("assert"));
+const crypto_1 = tslib_1.__importDefault(require("crypto"));
+const debug_1 = tslib_1.__importDefault(require("debug"));
+const events_1 = require("events");
+const net_1 = tslib_1.__importDefault(require("net"));
+const Advertiser_1 = require("./Advertiser");
 // noinspection JSDeprecatedSymbols
-var camera_1 = require("./camera");
-var Characteristic_1 = require("./Characteristic");
-var controller_1 = require("./controller");
-var HAPServer_1 = require("./HAPServer");
-var AccessoryInfo_1 = require("./model/AccessoryInfo");
-var ControllerStorage_1 = require("./model/ControllerStorage");
-var IdentifierCache_1 = require("./model/IdentifierCache");
-var Service_1 = require("./Service");
-var clone_1 = require("./util/clone");
-var request_util_1 = require("./util/request-util");
-var uuid = tslib_1.__importStar(require("./util/uuid"));
-var uuid_1 = require("./util/uuid");
-var debug = (0, debug_1.default)("HAP-NodeJS:Accessory");
-var MAX_ACCESSORIES = 149; // Maximum number of bridged accessories per bridge.
-var MAX_SERVICES = 100;
+const Characteristic_1 = require("./Characteristic");
+const controller_1 = require("./controller");
+const HAPServer_1 = require("./HAPServer");
+const AccessoryInfo_1 = require("./model/AccessoryInfo");
+const ControllerStorage_1 = require("./model/ControllerStorage");
+const IdentifierCache_1 = require("./model/IdentifierCache");
+const Service_1 = require("./Service");
+const clone_1 = require("./util/clone");
+const request_util_1 = require("./util/request-util");
+const uuid = tslib_1.__importStar(require("./util/uuid"));
+const uuid_1 = require("./util/uuid");
+const checkName_1 = require("./util/checkName");
+const debug = (0, debug_1.default)("HAP-NodeJS:Accessory");
+const MAX_ACCESSORIES = 149; // Maximum number of bridged accessories per bridge.
+const MAX_SERVICES = 100;
 /**
  * Known category values. Category is a hint to iOS clients about what "type" of Accessory this represents, for UI only.
  *
@@ -43,6 +43,7 @@ var Categories;
     Categories[Categories["THERMOSTAT"] = 9] = "THERMOSTAT";
     Categories[Categories["SENSOR"] = 10] = "SENSOR";
     Categories[Categories["ALARM_SYSTEM"] = 11] = "ALARM_SYSTEM";
+    // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values
     Categories[Categories["SECURITY_SYSTEM"] = 11] = "SECURITY_SYSTEM";
     Categories[Categories["DOOR"] = 12] = "DOOR";
     Categories[Categories["WINDOW"] = 13] = "WINDOW";
@@ -50,6 +51,7 @@ var Categories;
     Categories[Categories["PROGRAMMABLE_SWITCH"] = 15] = "PROGRAMMABLE_SWITCH";
     Categories[Categories["RANGE_EXTENDER"] = 16] = "RANGE_EXTENDER";
     Categories[Categories["CAMERA"] = 17] = "CAMERA";
+    // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values
     Categories[Categories["IP_CAMERA"] = 17] = "IP_CAMERA";
     Categories[Categories["VIDEO_DOORBELL"] = 18] = "VIDEO_DOORBELL";
     Categories[Categories["AIR_PURIFIER"] = 19] = "AIR_PURIFIER";
@@ -70,7 +72,7 @@ var Categories;
     Categories[Categories["AUDIO_RECEIVER"] = 34] = "AUDIO_RECEIVER";
     Categories[Categories["TV_SET_TOP_BOX"] = 35] = "TV_SET_TOP_BOX";
     Categories[Categories["TV_STREAMING_STICK"] = 36] = "TV_STREAMING_STICK";
-})(Categories = exports.Categories || (exports.Categories = {}));
+})(Categories || (exports.Categories = Categories = {}));
 /**
  * @group Accessory
  */
@@ -83,7 +85,7 @@ var CharacteristicWarningType;
     CharacteristicWarningType["WARN_MESSAGE"] = "warn-message";
     CharacteristicWarningType["ERROR_MESSAGE"] = "error-message";
     CharacteristicWarningType["DEBUG_MESSAGE"] = "debug-message";
-})(CharacteristicWarningType = exports.CharacteristicWarningType || (exports.CharacteristicWarningType = {}));
+})(CharacteristicWarningType || (exports.CharacteristicWarningType = CharacteristicWarningType = {}));
 /**
  * @group Accessory
  */
@@ -109,7 +111,7 @@ var MDNSAdvertiser;
      * Consequentially, treat this feature as an experimental feature.
      */
     MDNSAdvertiser["RESOLVED"] = "resolved";
-})(MDNSAdvertiser = exports.MDNSAdvertiser || (exports.MDNSAdvertiser = {}));
+})(MDNSAdvertiser || (exports.MDNSAdvertiser = MDNSAdvertiser = {}));
 var WriteRequestState;
 (function (WriteRequestState) {
     WriteRequestState[WriteRequestState["REGULAR_REQUEST"] = 0] = "REGULAR_REQUEST";
@@ -148,7 +150,7 @@ var AccessoryEventTypes;
     AccessoryEventTypes["PAIRED"] = "paired";
     AccessoryEventTypes["UNPAIRED"] = "unpaired";
     AccessoryEventTypes["CHARACTERISTIC_WARNING"] = "characteristic-warning";
-})(AccessoryEventTypes = exports.AccessoryEventTypes || (exports.AccessoryEventTypes = {}));
+})(AccessoryEventTypes || (exports.AccessoryEventTypes = AccessoryEventTypes = {}));
 /**
  * Accessory is a virtual HomeKit device. It can publish an associated HAP server for iOS devices to communicate
  * with - or it can run behind another "Bridge" Accessory server.
@@ -160,70 +162,93 @@ var AccessoryEventTypes;
  *
  * @group Accessory
  */
-var Accessory = /** @class */ (function (_super) {
-    tslib_1.__extends(Accessory, _super);
-    function Accessory(displayName, UUID) {
-        var _this = _super.call(this) || this;
-        _this.displayName = displayName;
-        _this.UUID = UUID;
-        // NOTICE: when adding/changing properties, remember to possibly adjust the serialize/deserialize functions
-        _this.aid = null; // assigned by us in assignIDs() or by a Bridge
-        _this._isBridge = false; // true if we are a Bridge (creating a new instance of the Bridge subclass sets this to true)
-        _this.bridged = false; // true if we are hosted "behind" a Bridge Accessory
-        _this.bridgedAccessories = []; // If we are a Bridge, these are the Accessories we are bridging
-        _this.reachable = true;
-        _this.category = 1 /* Categories.OTHER */;
-        _this.services = [];
-        _this.shouldPurgeUnusedIDs = true; // Purge unused ids by default
-        /**
-         * Captures if initialization steps inside {@link publish} have been called.
-         * This is important when calling {@link publish} multiple times (e.g. after calling {@link unpublish}).
-         * @private Private API
-         */
-        _this.initialized = false;
-        _this.controllers = {};
-        /**
-         * @private Private API.
-         */
-        _this._setupID = null;
-        /**
-         * @private Private API.
-         */
-        _this.controllerStorage = new ControllerStorage_1.ControllerStorage(_this);
-        /**
-         * This property captures the time when we last served a /accessories request.
-         * For multiple bursts of /accessories request we don't want to always contact GET handlers
-         */
-        _this.lastAccessoriesRequest = 0;
-        /**
-         * Returns the bridging accessory if this accessory is bridged.
-         * Otherwise, returns itself.
-         *
-         * @returns the primary accessory
-         */
-        _this.getPrimaryAccessory = function () {
-            return _this.bridged ? _this.bridge : _this;
-        };
+// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
+class Accessory extends events_1.EventEmitter {
+    displayName;
+    UUID;
+    // Timeout in milliseconds until a characteristic warning is issue
+    static TIMEOUT_WARNING = 3000;
+    // Timeout in milliseconds after `TIMEOUT_WARNING` until the operation on the characteristic is considered timed out.
+    static TIMEOUT_AFTER_WARNING = 6000;
+    // NOTICE: when adding/changing properties, remember to possibly adjust the serialize/deserialize functions
+    aid = null; // assigned by us in assignIDs() or by a Bridge
+    _isBridge = false; // true if we are a Bridge (creating a new instance of the Bridge subclass sets this to true)
+    bridged = false; // true if we are hosted "behind" a Bridge Accessory
+    bridge; // if accessory is bridged, this property points to the bridge which bridges this accessory
+    bridgedAccessories = []; // If we are a Bridge, these are the Accessories we are bridging
+    reachable = true;
+    lastKnownUsername;
+    category = 1 /* Categories.OTHER */;
+    services = [];
+    primaryService;
+    shouldPurgeUnusedIDs = true; // Purge unused ids by default
+    /**
+     * Captures if initialization steps inside {@link publish} have been called.
+     * This is important when calling {@link publish} multiple times (e.g. after calling {@link unpublish}).
+     * @private Private API
+     */
+    initialized = false;
+    controllers = {};
+    serializedControllers; // store uninitialized controller data after a Accessory.deserialize call
+    activeCameraController;
+    /**
+     * @private Private API.
+     */
+    _accessoryInfo;
+    /**
+     * @private Private API.
+     */
+    _setupID = null;
+    /**
+     * @private Private API.
+     */
+    _identifierCache;
+    /**
+     * @private Private API.
+     */
+    controllerStorage = new ControllerStorage_1.ControllerStorage(this);
+    /**
+     * @private Private API.
+     */
+    _advertiser;
+    /**
+     * @private Private API.
+     */
+    _server;
+    /**
+     * @private Private API.
+     */
+    _setupURI;
+    configurationChangeDebounceTimeout;
+    /**
+     * This property captures the time when we last served a /accessories request.
+     * For multiple bursts of /accessories request we don't want to always contact GET handlers
+     */
+    lastAccessoriesRequest = 0;
+    constructor(displayName, UUID) {
+        super();
+        this.displayName = displayName;
+        this.UUID = UUID;
         (0, assert_1.default)(displayName, "Accessories must be created with a non-empty displayName.");
         (0, assert_1.default)(UUID, "Accessories must be created with a valid UUID.");
         (0, assert_1.default)(uuid.isValid(UUID), "UUID '" + UUID + "' is not a valid UUID. Try using the provided 'generateUUID' function to create a " +
             "valid UUID from any arbitrary string, like a serial number.");
         // create our initial "Accessory Information" Service that all Accessories are expected to have
-        _this.addService(Service_1.Service.AccessoryInformation)
+        (0, checkName_1.checkName)(this.displayName, "Name", displayName);
+        this.addService(Service_1.Service.AccessoryInformation)
             .setCharacteristic(Characteristic_1.Characteristic.Name, displayName);
         // sign up for when iOS attempts to "set" the `Identify` characteristic - this means a paired device wishes
         // for us to identify ourselves (as opposed to an unpaired device - that case is handled by HAPServer 'identify' event)
-        _this.getService(Service_1.Service.AccessoryInformation)
+        this.getService(Service_1.Service.AccessoryInformation)
             .getCharacteristic(Characteristic_1.Characteristic.Identify)
-            .on("set" /* CharacteristicEventTypes.SET */, function (value, callback) {
+            .on("set" /* CharacteristicEventTypes.SET */, (value, callback) => {
             if (value) {
-                var paired = true;
-                _this.identificationRequest(paired, callback);
+                const paired = true;
+                this.identificationRequest(paired, callback);
             }
         });
-        return _this;
     }
-    Accessory.prototype.identificationRequest = function (paired, callback) {
+    identificationRequest(paired, callback) {
         debug("[%s] Identification request", this.displayName);
         if (this.listeners("identify" /* AccessoryEventTypes.IDENTIFY */).length > 0) {
             // allow implementors to identify this Accessory in whatever way is appropriate, and pass along
@@ -234,43 +259,28 @@ var Accessory = /** @class */ (function (_super) {
             debug("[%s] Identification request ignored; no listeners to 'identify' event", this.displayName);
             callback();
         }
-    };
+    }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    Accessory.prototype.addService = function (serviceParam) {
-        var e_1, _a;
-        var constructorArgs = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            constructorArgs[_i - 1] = arguments[_i];
-        }
+    addService(serviceParam, ...constructorArgs) {
         // service might be a constructor like `Service.AccessoryInformation` instead of an instance
         // of Service. Coerce if necessary.
-        var service = typeof serviceParam === "function"
+        const service = typeof serviceParam === "function"
             ? new serviceParam(constructorArgs[0], constructorArgs[1], constructorArgs[2])
             : serviceParam;
-        try {
-            // check for UUID+subtype conflict
-            for (var _b = tslib_1.__values(this.services), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var existing = _c.value;
-                if (existing.UUID === service.UUID) {
-                    // OK we have two Services with the same UUID. Check that each defines a `subtype` property and that each is unique.
-                    if (!service.subtype) {
-                        throw new Error("Cannot add a Service with the same UUID '" + existing.UUID +
-                            "' as another Service in this Accessory without also defining a unique 'subtype' property.");
-                    }
-                    if (service.subtype === existing.subtype) {
-                        throw new Error("Cannot add a Service with the same UUID '" + existing.UUID +
-                            "' and subtype '" + existing.subtype + "' as another Service in this Accessory.");
-                    }
+        // check for UUID+subtype conflict
+        for (const existing of this.services) {
+            if (existing.UUID === service.UUID) {
+                // OK we have two Services with the same UUID. Check that each defines a `subtype` property and that each is unique.
+                if (!service.subtype) {
+                    throw new Error("Cannot add a Service with the same UUID '" + existing.UUID +
+                        "' as another Service in this Accessory without also defining a unique 'subtype' property.");
+                }
+                if (service.subtype === existing.subtype) {
+                    throw new Error("Cannot add a Service with the same UUID '" + existing.UUID +
+                        "' and subtype '" + existing.subtype + "' as another Service in this Accessory.");
                 }
             }
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
         if (this.services.length >= MAX_SERVICES) {
             throw new Error("Cannot add more than " + MAX_SERVICES + " services to a single accessory!");
         }
@@ -289,15 +299,9 @@ var Accessory = /** @class */ (function (_super) {
         }
         this.setupServiceEventHandlers(service);
         return service;
-    };
-    /**
-     * @deprecated use {@link Service.setPrimaryService} directly
-     */
-    Accessory.prototype.setPrimaryService = function (service) {
-        service.setPrimaryService();
-    };
-    Accessory.prototype.removeService = function (service) {
-        var index = this.services.indexOf(service);
+    }
+    removeService(service) {
+        const index = this.services.indexOf(service);
         if (index >= 0) {
             this.services.splice(index, 1);
             if (this.primaryService === service) { // check if we are removing out primary service
@@ -312,80 +316,50 @@ var Accessory = /** @class */ (function (_super) {
             }
             service.removeAllListeners();
         }
-    };
-    Accessory.prototype.removeLinkedService = function (removed) {
-        var e_2, _a;
-        try {
-            for (var _b = tslib_1.__values(this.services), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var service = _c.value;
-                service.removeLinkedService(removed);
-            }
+    }
+    removeLinkedService(removed) {
+        for (const service of this.services) {
+            service.removeLinkedService(removed);
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+    }
+    getService(name) {
+        for (const service of this.services) {
+            if (typeof name === "string" && (service.displayName === name || service.name === name || service.subtype === name)) {
+                return service;
             }
-            finally { if (e_2) throw e_2.error; }
-        }
-    };
-    Accessory.prototype.getService = function (name) {
-        var e_3, _a;
-        try {
-            for (var _b = tslib_1.__values(this.services), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var service = _c.value;
-                if (typeof name === "string" && (service.displayName === name || service.name === name || service.subtype === name)) {
-                    return service;
-                }
-                else if (typeof name === "function" && ((service instanceof name) || (name.UUID === service.UUID))) {
+            else {
+                // @ts-expect-error ('UUID' does not exist on type 'never')
+                if (typeof name === "function" && ((service instanceof name) || (name.UUID === service.UUID))) {
                     return service;
                 }
             }
         }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_3) throw e_3.error; }
-        }
         return undefined;
-    };
-    Accessory.prototype.getServiceById = function (uuid, subType) {
-        var e_4, _a;
-        try {
-            for (var _b = tslib_1.__values(this.services), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var service = _c.value;
-                if (typeof uuid === "string" && (service.displayName === uuid || service.name === uuid) && service.subtype === subType) {
-                    return service;
-                }
-                else if (typeof uuid === "function" && ((service instanceof uuid) || (uuid.UUID === service.UUID)) && service.subtype === subType) {
+    }
+    getServiceById(uuid, subType) {
+        for (const service of this.services) {
+            if (typeof uuid === "string" && (service.displayName === uuid || service.name === uuid) && service.subtype === subType) {
+                return service;
+            }
+            else {
+                // @ts-expect-error ('UUID' does not exist on type 'never')
+                if (typeof uuid === "function" && ((service instanceof uuid) || (uuid.UUID === service.UUID)) && service.subtype === subType) {
                     return service;
                 }
             }
         }
-        catch (e_4_1) { e_4 = { error: e_4_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_4) throw e_4.error; }
-        }
         return undefined;
-    };
+    }
     /**
-     * @deprecated Not supported anymore
+     * Returns the bridging accessory if this accessory is bridged.
+     * Otherwise, returns itself.
+     *
+     * @returns the primary accessory
      */
-    Accessory.prototype.updateReachability = function (reachable) {
-        if (!this.bridged) {
-            throw new Error("Cannot update reachability on non-bridged accessory!");
-        }
-        this.reachable = reachable;
-        debug("Reachability update is no longer being supported.");
+    getPrimaryAccessory = () => {
+        return this.bridged ? this.bridge : this;
     };
-    Accessory.prototype.addBridgedAccessory = function (accessory, deferUpdate) {
-        var _this = this;
-        if (deferUpdate === void 0) { deferUpdate = false; }
+    addBridgedAccessory(accessory, deferUpdate = false) {
         if (accessory._isBridge || accessory === this) {
             throw new Error("Illegal state: either trying to bridge a bridge or trying to bridge itself!");
         }
@@ -400,7 +374,7 @@ var Accessory = /** @class */ (function (_super) {
             throw new Error("Cannot Bridge more than " + MAX_ACCESSORIES + " Accessories");
         }
         // listen for changes in ANY characteristics of ANY services on this Accessory
-        accessory.on("service-characteristic-change" /* AccessoryEventTypes.SERVICE_CHARACTERISTIC_CHANGE */, function (change) { return _this.handleCharacteristicChangeEvent(accessory, change.service, change); });
+        accessory.on("service-characteristic-change" /* AccessoryEventTypes.SERVICE_CHARACTERISTIC_CHANGE */, change => this.handleCharacteristicChangeEvent(accessory, change.service, change));
         accessory.on("service-configurationChange" /* AccessoryEventTypes.SERVICE_CONFIGURATION_CHANGE */, this.enqueueConfigurationUpdate.bind(this));
         accessory.on("characteristic-warning" /* AccessoryEventTypes.CHARACTERISTIC_WARNING */, this.handleCharacteristicWarning.bind(this));
         accessory.bridged = true;
@@ -411,28 +385,16 @@ var Accessory = /** @class */ (function (_super) {
             this.enqueueConfigurationUpdate();
         }
         return accessory;
-    };
-    Accessory.prototype.addBridgedAccessories = function (accessories) {
-        var e_5, _a;
-        try {
-            for (var accessories_1 = tslib_1.__values(accessories), accessories_1_1 = accessories_1.next(); !accessories_1_1.done; accessories_1_1 = accessories_1.next()) {
-                var accessory = accessories_1_1.value;
-                this.addBridgedAccessory(accessory, true);
-            }
-        }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
-        finally {
-            try {
-                if (accessories_1_1 && !accessories_1_1.done && (_a = accessories_1.return)) _a.call(accessories_1);
-            }
-            finally { if (e_5) throw e_5.error; }
+    }
+    addBridgedAccessories(accessories) {
+        for (const accessory of accessories) {
+            this.addBridgedAccessory(accessory, true);
         }
         this.enqueueConfigurationUpdate();
-    };
-    Accessory.prototype.removeBridgedAccessory = function (accessory, deferUpdate) {
-        if (deferUpdate === void 0) { deferUpdate = false; }
+    }
+    removeBridgedAccessory(accessory, deferUpdate = false) {
         // check for UUID conflict
-        var accessoryIndex = this.bridgedAccessories.indexOf(accessory);
+        const accessoryIndex = this.bridgedAccessories.indexOf(accessory);
         if (accessoryIndex === -1) {
             throw new Error("Cannot find the bridged Accessory to remove.");
         }
@@ -443,110 +405,37 @@ var Accessory = /** @class */ (function (_super) {
         if (!deferUpdate) {
             this.enqueueConfigurationUpdate();
         }
-    };
-    Accessory.prototype.removeBridgedAccessories = function (accessories) {
-        var e_6, _a;
-        try {
-            for (var accessories_2 = tslib_1.__values(accessories), accessories_2_1 = accessories_2.next(); !accessories_2_1.done; accessories_2_1 = accessories_2.next()) {
-                var accessory = accessories_2_1.value;
-                this.removeBridgedAccessory(accessory, true);
-            }
-        }
-        catch (e_6_1) { e_6 = { error: e_6_1 }; }
-        finally {
-            try {
-                if (accessories_2_1 && !accessories_2_1.done && (_a = accessories_2.return)) _a.call(accessories_2);
-            }
-            finally { if (e_6) throw e_6.error; }
+    }
+    removeBridgedAccessories(accessories) {
+        for (const accessory of accessories) {
+            this.removeBridgedAccessory(accessory, true);
         }
         this.enqueueConfigurationUpdate();
-    };
-    Accessory.prototype.removeAllBridgedAccessories = function () {
-        for (var i = this.bridgedAccessories.length - 1; i >= 0; i--) {
+    }
+    removeAllBridgedAccessories() {
+        for (let i = this.bridgedAccessories.length - 1; i >= 0; i--) {
             this.removeBridgedAccessory(this.bridgedAccessories[i], true);
         }
         this.enqueueConfigurationUpdate();
-    };
-    Accessory.prototype.getCharacteristicByIID = function (iid) {
-        var e_7, _a;
-        try {
-            for (var _b = tslib_1.__values(this.services), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var service = _c.value;
-                var characteristic = service.getCharacteristicByIID(iid);
-                if (characteristic) {
-                    return characteristic;
-                }
-            }
-        }
-        catch (e_7_1) { e_7 = { error: e_7_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+    }
+    getCharacteristicByIID(iid) {
+        for (const service of this.services) {
+            const characteristic = service.getCharacteristicByIID(iid);
+            if (characteristic) {
+                return characteristic;
             }
-            finally { if (e_7) throw e_7.error; }
         }
-    };
-    Accessory.prototype.getAccessoryByAID = function (aid) {
+    }
+    getAccessoryByAID(aid) {
         if (this.aid === aid) {
             return this;
         }
-        return this.bridgedAccessories.find(function (value) { return value.aid === aid; });
-    };
-    Accessory.prototype.findCharacteristic = function (aid, iid) {
-        var accessory = this.getAccessoryByAID(aid);
+        return this.bridgedAccessories.find(value => value.aid === aid);
+    }
+    findCharacteristic(aid, iid) {
+        const accessory = this.getAccessoryByAID(aid);
         return accessory && accessory.getCharacteristicByIID(iid);
-    };
-    // noinspection JSDeprecatedSymbols
-    /**
-     * Method is used to configure an old style CameraSource.
-     * The CameraSource API was fully replaced by the new Controller API used by {@link CameraController}.
-     * The {@link CameraStreamingDelegate} used by the CameraController is the equivalent to the old CameraSource.
-     *
-     * The new Controller API is much more refined and robust way of "grouping" services together.
-     * It especially is intended to fully support serialization/deserialization to/from persistent storage.
-     * This feature is also gained when using the old style CameraSource API.
-     * The {@link CameraStreamingDelegate} improves on the overall camera API though and provides some reworked
-     * type definitions and a refined callback interface to better signal errors to the requesting HomeKit device.
-     * It is advised to update to it.
-     *
-     * Full backwards compatibility is currently maintained. A legacy CameraSource will be wrapped into an Adapter.
-     * All legacy StreamControllers in the "streamControllers" property will be replaced by CameraRTPManagement instances.
-     * Any services in the "services" property which are one of the following are ignored:
-     *     - CameraRTPStreamManagement
-     *     - CameraOperatingMode
-     *     - CameraEventRecordingManagement
-     *
-     * @param cameraSource - The instance of the legacy camera source
-     * @deprecated please refer to the new {@link CameraController} API and {@link configureController}
-     */
-    Accessory.prototype.configureCameraSource = function (cameraSource) {
-        var _this = this;
-        if (cameraSource.streamControllers.length === 0) {
-            throw new Error("Malformed legacy CameraSource. Did not expose any StreamControllers!");
-        }
-        var options = cameraSource.streamControllers[0].options; // grab options from one of the StreamControllers
-        var cameraControllerOptions = {
-            cameraStreamCount: cameraSource.streamControllers.length,
-            streamingOptions: options,
-            delegate: new camera_1.LegacyCameraSourceAdapter(cameraSource),
-        };
-        var cameraController = new controller_1.CameraController(cameraControllerOptions, true); // create CameraController in legacy mode
-        this.configureController(cameraController);
-        // we try here to be as good as possibly of keeping current behaviour
-        cameraSource.services.forEach(function (service) {
-            if (service.UUID === Service_1.Service.CameraRTPStreamManagement.UUID || service.UUID === Service_1.Service.CameraOperatingMode.UUID
-                || service.UUID === Service_1.Service.CameraRecordingManagement.UUID) {
-                return; // ignore those services, as they get replaced by the RTPStreamManagement
-            }
-            // all other services get added. We can't really control possibly linking to any of those ignored services
-            // so this is really only half-baked stuff.
-            _this.addService(service);
-        });
-        // replace stream controllers; basically only to still support the "forceStop" call
-        // noinspection JSDeprecatedSymbols
-        cameraSource.streamControllers = cameraController.streamManagements;
-        return cameraController; // return the reference for the controller (maybe this could be useful?)
-    };
+    }
     /**
      * This method is used to set up a new Controller for this accessory. See {@link Controller} for a more detailed
      * explanation what a Controller is and what it is capable of.
@@ -561,20 +450,19 @@ var Accessory = /** @class */ (function (_super) {
      *
      * @param controllerConstructor - The Controller instance or constructor to the Controller with no required arguments.
      */
-    Accessory.prototype.configureController = function (controllerConstructor) {
-        var _this = this;
-        var controller = typeof controllerConstructor === "function"
+    configureController(controllerConstructor) {
+        const controller = typeof controllerConstructor === "function"
             ? new controllerConstructor() // any custom constructor arguments should be passed before using .bind(...)
             : controllerConstructor;
-        var id = controller.controllerId();
+        const id = controller.controllerId();
         if (this.controllers[id]) {
-            throw new Error("A Controller with the type/id '".concat(id, "' was already added to the accessory ").concat(this.displayName));
+            throw new Error(`A Controller with the type/id '${id}' was already added to the accessory ${this.displayName}`);
         }
-        var savedServiceMap = this.serializedControllers && this.serializedControllers[id];
-        var serviceMap;
+        const savedServiceMap = this.serializedControllers && this.serializedControllers[id];
+        let serviceMap;
         if (savedServiceMap) { // we found data to restore from
-            var clonedServiceMap = (0, clone_1.clone)(savedServiceMap);
-            var updatedServiceMap = controller.initWithServices(savedServiceMap); // init controller with existing services
+            const clonedServiceMap = (0, clone_1.clone)(savedServiceMap);
+            const updatedServiceMap = controller.initWithServices(savedServiceMap); // init controller with existing services
             serviceMap = updatedServiceMap || savedServiceMap; // initWithServices could return an updated serviceMap, otherwise just use the existing one
             if (updatedServiceMap) { // controller returned a ServiceMap and thus signaled an updated set of services
                 // clonedServiceMap is altered by this method, should not be touched again after this call (for the future people)
@@ -590,14 +478,14 @@ var Accessory = /** @class */ (function (_super) {
         else {
             serviceMap = controller.constructServices(); // let the controller create his services
             controller.configureServices(); // let the controller setup all its handlers
-            Object.values(serviceMap).forEach(function (service) {
-                if (service && !_this.services.includes(service)) {
-                    _this.addService(service);
+            Object.values(serviceMap).forEach(service => {
+                if (service && !this.services.includes(service)) {
+                    this.addService(service);
                 }
             });
         }
         // --- init handlers and setup context ---
-        var context = {
+        const context = {
             controller: controller,
             serviceMap: serviceMap,
         };
@@ -608,7 +496,7 @@ var Accessory = /** @class */ (function (_super) {
         if (controller instanceof controller_1.CameraController) { // save CameraController for Snapshot handling
             this.activeCameraController = controller;
         }
-    };
+    }
     /**
      * This method will remove a given Controller from this accessory.
      * The controller object will be restored to its initial state.
@@ -616,10 +504,9 @@ var Accessory = /** @class */ (function (_super) {
      *
      * @param controller - The controller which should be removed from the accessory.
      */
-    Accessory.prototype.removeController = function (controller) {
-        var _this = this;
-        var id = controller.controllerId();
-        var storedController = this.controllers[id];
+    removeController(controller) {
+        const id = controller.controllerId();
+        const storedController = this.controllers[id];
         if (storedController) {
             if (storedController.controller !== controller) {
                 throw new Error("[" + this.displayName + "] tried removing a controller with the id/type '" + id +
@@ -637,133 +524,117 @@ var Accessory = /** @class */ (function (_super) {
             if (this.activeCameraController === controller) {
                 this.activeCameraController = undefined;
             }
-            Object.values(storedController.serviceMap).forEach(function (service) {
+            Object.values(storedController.serviceMap).forEach(service => {
                 if (service) {
-                    _this.removeService(service);
+                    this.removeService(service);
                 }
             });
         }
         if (this.serializedControllers) {
             delete this.serializedControllers[id];
         }
-    };
-    Accessory.prototype.handleAccessoryUnpairedForControllers = function () {
-        var e_8, _a;
-        try {
-            for (var _b = tslib_1.__values(Object.values(this.controllers)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var context = _c.value;
-                var controller = context.controller;
-                if (controller.handleFactoryReset) { // if the controller implements handleFactoryReset, setup event handlers for this controller
-                    controller.handleFactoryReset();
-                }
-                if ((0, controller_1.isSerializableController)(controller)) {
-                    this.controllerStorage.purgeControllerData(controller);
-                }
+    }
+    handleAccessoryUnpairedForControllers() {
+        for (const context of Object.values(this.controllers)) {
+            const controller = context.controller;
+            if (controller.handleFactoryReset) { // if the controller implements handleFactoryReset, setup event handlers for this controller
+                controller.handleFactoryReset();
             }
-        }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            if ((0, controller_1.isSerializableController)(controller)) {
+                this.controllerStorage.purgeControllerData(controller);
             }
-            finally { if (e_8) throw e_8.error; }
         }
-    };
-    Accessory.prototype.handleUpdatedControllerServiceMap = function (originalServiceMap, updatedServiceMap) {
-        var _this = this;
+    }
+    handleUpdatedControllerServiceMap(originalServiceMap, updatedServiceMap) {
         updatedServiceMap = (0, clone_1.clone)(updatedServiceMap); // clone it so we can alter it
-        Object.keys(originalServiceMap).forEach(function (name) {
-            var service = originalServiceMap[name];
-            var updatedService = updatedServiceMap[name];
+        Object.keys(originalServiceMap).forEach(name => {
+            const service = originalServiceMap[name];
+            const updatedService = updatedServiceMap[name];
             if (service && updatedService) { // we check all names contained in both ServiceMaps for changes
                 delete originalServiceMap[name]; // delete from original ServiceMap, so it will only contain deleted services at the end
                 delete updatedServiceMap[name]; // delete from updated ServiceMap, so it will only contain added services at the end
                 if (service !== updatedService) {
-                    _this.removeService(service);
-                    _this.addService(updatedService);
+                    this.removeService(service);
+                    this.addService(updatedService);
                 }
             }
         });
         // now originalServiceMap contains only deleted services and updateServiceMap only added services
-        Object.values(originalServiceMap).forEach(function (service) {
+        Object.values(originalServiceMap).forEach(service => {
             if (service) {
-                _this.removeService(service);
+                this.removeService(service);
             }
         });
-        Object.values(updatedServiceMap).forEach(function (service) {
+        Object.values(updatedServiceMap).forEach(service => {
             if (service) {
-                _this.addService(service);
+                this.addService(service);
             }
         });
-    };
-    Accessory.prototype.setupURI = function () {
+    }
+    setupURI() {
         if (this._setupURI) {
             return this._setupURI;
         }
         (0, assert_1.default)(!!this._accessoryInfo, "Cannot generate setupURI on an accessory that isn't published yet!");
-        var buffer = Buffer.alloc(8);
-        var value_low = parseInt(this._accessoryInfo.pincode.replace(/-/g, ""), 10);
-        var value_high = this._accessoryInfo.category >> 1;
+        const buffer = Buffer.alloc(8);
+        let value_low = parseInt(this._accessoryInfo.pincode.replace(/-/g, ""), 10);
+        const value_high = this._accessoryInfo.category >> 1;
         value_low |= 1 << 28; // Supports IP;
         buffer.writeUInt32BE(value_low, 4);
         if (this._accessoryInfo.category & 1) {
             buffer[4] = buffer[4] | 1 << 7;
         }
         buffer.writeUInt32BE(value_high, 0);
-        var encodedPayload = (buffer.readUInt32BE(4) + (buffer.readUInt32BE(0) * 0x100000000)).toString(36).toUpperCase();
+        let encodedPayload = (buffer.readUInt32BE(4) + (buffer.readUInt32BE(0) * 0x100000000)).toString(36).toUpperCase();
         if (encodedPayload.length !== 9) {
-            for (var i = 0; i <= 9 - encodedPayload.length; i++) {
+            for (let i = 0; i <= 9 - encodedPayload.length; i++) {
                 encodedPayload = "0" + encodedPayload;
             }
         }
         this._setupURI = "X-HM://" + encodedPayload + this._setupID;
         return this._setupURI;
-    };
+    }
     /**
      * This method is called right before the accessory is published. It should be used to check for common
      * mistakes in Accessory structured, which may lead to HomeKit rejecting the accessory when pairing.
      * If it is called on a bridge it will call this method for all bridged accessories.
      */
-    Accessory.prototype.validateAccessory = function (mainAccessory) {
-        var _this = this;
-        var service = this.getService(Service_1.Service.AccessoryInformation);
+    validateAccessory(mainAccessory) {
+        const service = this.getService(Service_1.Service.AccessoryInformation);
         if (!service) {
             console.log("HAP-NodeJS WARNING: The accessory '" + this.displayName + "' is getting published without a AccessoryInformation service. " +
                 "This might prevent the accessory from being added to the Home app or leading to the accessory being unresponsive!");
         }
         else {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            var checkValue = function (name, value) {
+            const checkValue = (name, value) => {
                 if (!value) {
-                    console.log("HAP-NodeJS WARNING: The accessory '" + _this.displayName + "' is getting published with the characteristic '" + name + "'" +
+                    console.log("HAP-NodeJS WARNING: The accessory '" + this.displayName + "' is getting published with the characteristic '" + name + "'" +
                         " (of the AccessoryInformation service) not having a value set. " +
                         "This might prevent the accessory from being added to the Home App or leading to the accessory being unresponsive!");
                 }
             };
-            var model = service.getCharacteristic(Characteristic_1.Characteristic.Model).value;
-            var serialNumber = service.getCharacteristic(Characteristic_1.Characteristic.SerialNumber).value;
-            var firmwareRevision = service.getCharacteristic(Characteristic_1.Characteristic.FirmwareRevision).value;
-            var name = service.getCharacteristic(Characteristic_1.Characteristic.Name).value;
-            checkValue("Model", model);
-            checkValue("SerialNumber", serialNumber);
-            checkValue("FirmwareRevision", firmwareRevision);
-            checkValue("Name", name);
+            (0, checkName_1.checkName)(this.displayName, "Name", service.getCharacteristic(Characteristic_1.Characteristic.Name).value);
+            checkValue("FirmwareRevision", service.getCharacteristic(Characteristic_1.Characteristic.FirmwareRevision).value);
+            checkValue("Manufacturer", service.getCharacteristic(Characteristic_1.Characteristic.Manufacturer).value);
+            checkValue("Model", service.getCharacteristic(Characteristic_1.Characteristic.Model).value);
+            checkValue("Name", service.getCharacteristic(Characteristic_1.Characteristic.Name).value);
+            checkValue("SerialNumber", service.getCharacteristic(Characteristic_1.Characteristic.SerialNumber).value);
         }
         if (mainAccessory) {
             // the main accessory which is advertised via bonjour must have a name with length <= 63 (limitation of DNS FQDN names)
             (0, assert_1.default)(Buffer.from(this.displayName, "utf8").length <= 63, "Accessory displayName cannot be longer than 63 bytes!");
         }
         if (this.bridged) {
-            this.bridgedAccessories.forEach(function (accessory) { return accessory.validateAccessory(); });
+            this.bridgedAccessories.forEach(accessory => accessory.validateAccessory());
         }
-    };
+    }
     /**
      * Assigns aid/iid to ourselves, any Accessories we are bridging, and all associated Services+Characteristics. Uses
      * the provided identifierCache to keep IDs stable.
      * @private Private API
      */
-    Accessory.prototype._assignIDs = function (identifierCache) {
-        var e_9, _a, e_10, _b;
+    _assignIDs(identifierCache) {
         // if we are responsible for our own identifierCache, start the expiration process
         // also check weather we want to have an expiration process
         if (this._identifierCache && this.shouldPurgeUnusedIDs) {
@@ -779,37 +650,17 @@ var Accessory = /** @class */ (function (_super) {
             // we must have aid = 1
             this.aid = 1;
         }
-        try {
-            for (var _c = tslib_1.__values(this.services), _d = _c.next(); !_d.done; _d = _c.next()) {
-                var service = _d.value;
-                if (this._isBridge) {
-                    service._assignIDs(identifierCache, this.UUID, 2000000000);
-                }
-                else {
-                    service._assignIDs(identifierCache, this.UUID);
-                }
-            }
-        }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
-        finally {
-            try {
-                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+        for (const service of this.services) {
+            if (this._isBridge) {
+                service._assignIDs(identifierCache, this.UUID, 2000000000);
             }
-            finally { if (e_9) throw e_9.error; }
-        }
-        try {
-            // now assign IDs for any Accessories we are bridging
-            for (var _e = tslib_1.__values(this.bridgedAccessories), _f = _e.next(); !_f.done; _f = _e.next()) {
-                var accessory = _f.value;
-                accessory._assignIDs(identifierCache);
+            else {
+                service._assignIDs(identifierCache, this.UUID);
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
-        finally {
-            try {
-                if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
-            }
-            finally { if (e_10) throw e_10.error; }
+        // now assign IDs for any Accessories we are bridging
+        for (const accessory of this.bridgedAccessories) {
+            accessory._assignIDs(identifierCache);
         }
         // expire any now-unused cache keys (for Accessories, Services, or Characteristics
         // that have been removed since the last call to assignIDs())
@@ -821,284 +672,218 @@ var Accessory = /** @class */ (function (_super) {
             //Save in case we have new ones
             this._identifierCache.save();
         }
-    };
-    Accessory.prototype.disableUnusedIDPurge = function () {
+    }
+    disableUnusedIDPurge() {
         this.shouldPurgeUnusedIDs = false;
-    };
-    Accessory.prototype.enableUnusedIDPurge = function () {
+    }
+    enableUnusedIDPurge() {
         this.shouldPurgeUnusedIDs = true;
-    };
+    }
     /**
      * Manually purge the unused ids if you like, comes handy
      * when you have disabled auto purge, so you can do it manually
      */
-    Accessory.prototype.purgeUnusedIDs = function () {
+    purgeUnusedIDs() {
         //Cache the state of the purge mechanism and set it to true
-        var oldValue = this.shouldPurgeUnusedIDs;
+        const oldValue = this.shouldPurgeUnusedIDs;
         this.shouldPurgeUnusedIDs = true;
         //Reassign all ids
         this._assignIDs(this._identifierCache);
         // Revert the purge mechanism state
         this.shouldPurgeUnusedIDs = oldValue;
-    };
+    }
     /**
      * Returns a JSON representation of this accessory suitable for delivering to HAP clients.
      */
-    Accessory.prototype.toHAP = function (connection, contactGetHandlers) {
-        if (contactGetHandlers === void 0) { contactGetHandlers = true; }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var accessory, accessories, _a, _b, _c, _d;
-            var _e;
-            return tslib_1.__generator(this, function (_f) {
-                switch (_f.label) {
-                    case 0:
-                        (0, assert_1.default)(this.aid, "aid cannot be undefined for accessory '" + this.displayName + "'");
-                        (0, assert_1.default)(this.services.length, "accessory '" + this.displayName + "' does not have any services!");
-                        _e = {
-                            aid: this.aid
-                        };
-                        return [4 /*yield*/, Promise.all(this.services.map(function (service) { return service.toHAP(connection, contactGetHandlers); }))];
-                    case 1:
-                        accessory = (_e.services = _f.sent(),
-                            _e);
-                        accessories = [accessory];
-                        if (!!this.bridged) return [3 /*break*/, 3];
-                        _b = (_a = accessories.push).apply;
-                        _c = [accessories];
-                        _d = [[]];
-                        return [4 /*yield*/, Promise.all(this.bridgedAccessories
-                                .map(function (accessory) { return accessory.toHAP(connection, contactGetHandlers).then(function (value) { return value[0]; }); }))];
-                    case 2:
-                        _b.apply(_a, _c.concat([tslib_1.__spreadArray.apply(void 0, _d.concat([tslib_1.__read.apply(void 0, [_f.sent()]), false]))]));
-                        _f.label = 3;
-                    case 3: return [2 /*return*/, accessories];
-                }
-            });
-        });
-    };
+    async toHAP(connection, contactGetHandlers = true) {
+        (0, assert_1.default)(this.aid, "aid cannot be undefined for accessory '" + this.displayName + "'");
+        (0, assert_1.default)(this.services.length, "accessory '" + this.displayName + "' does not have any services!");
+        const accessory = {
+            aid: this.aid,
+            services: await Promise.all(this.services.map(service => service.toHAP(connection, contactGetHandlers))),
+        };
+        const accessories = [accessory];
+        if (!this.bridged) {
+            accessories.push(...await Promise.all(this.bridgedAccessories
+                .map(accessory => accessory.toHAP(connection, contactGetHandlers).then(value => value[0]))));
+        }
+        return accessories;
+    }
     /**
      * Returns a JSON representation of this accessory without characteristic values.
      */
-    Accessory.prototype.internalHAPRepresentation = function (assignIds) {
-        var e_11, _a;
-        if (assignIds === void 0) { assignIds = true; }
+    internalHAPRepresentation(assignIds = true) {
         if (assignIds) {
             this._assignIDs(this._identifierCache); // make sure our aid/iid's are all assigned
         }
         (0, assert_1.default)(this.aid, "aid cannot be undefined for accessory '" + this.displayName + "'");
         (0, assert_1.default)(this.services.length, "accessory '" + this.displayName + "' does not have any services!");
-        var accessory = {
+        const accessory = {
             aid: this.aid,
-            services: this.services.map(function (service) { return service.internalHAPRepresentation(); }),
+            services: this.services.map(service => service.internalHAPRepresentation()),
         };
-        var accessories = [accessory];
+        const accessories = [accessory];
         if (!this.bridged) {
-            try {
-                for (var _b = tslib_1.__values(this.bridgedAccessories), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var accessory_1 = _c.value;
-                    accessories.push(accessory_1.internalHAPRepresentation(false)[0]);
-                }
-            }
-            catch (e_11_1) { e_11 = { error: e_11_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                }
-                finally { if (e_11) throw e_11.error; }
+            for (const accessory of this.bridgedAccessories) {
+                accessories.push(accessory.internalHAPRepresentation(false)[0]);
             }
         }
         return accessories;
-    };
+    }
     /**
-     * Publishes this Accessory on the local network for iOS clients to communicate with.
-     *
-     * @param {Object} info - Required info for publishing.
-     * @param allowInsecureRequest - Will allow unencrypted and unauthenticated access to the http server
-     * @param {string} info.username - The "username" (formatted as a MAC address - like "CC:22:3D:E3:CE:F6") of
-     *                                this Accessory. Must be globally unique from all Accessories on your local network.
-     * @param {string} info.pincode - The 8-digit pincode for clients to use when pairing this Accessory. Must be formatted
-     *                               as a string like "031-45-154".
-     * @param {string} info.category - One of the values of the Accessory.Category enum, like Accessory.Category.SWITCH.
-     *                                This is a hint to iOS clients about what "type" of Accessory this represents, so
-     *                                that for instance an appropriate icon can be drawn for the user while adding a
-     *                                new Accessory.
+     * Publishes this accessory on the local network for iOS clients to communicate with.
+     * - `info.username` - formatted as a MAC address, like `CC:22:3D:E3:CE:F6`, of this accessory.
+     *   Must be globally unique from all Accessories on your local network.
+     * - `info.pincode` - the 8-digit pin code for clients to use when pairing this Accessory.
+     *   Must be formatted as a string like `031-45-154`.
+     * - `info.category` - one of the values of the `Accessory.Category` enum, like `Accessory.Category.SWITCH`.
+     *   This is a hint to iOS clients about what "type" of Accessory this represents, so
+     *   that for instance an appropriate icon can be drawn for the user while adding a
+     *   new Accessory.
+     * @param {{
+     *   username: string;
+     *   pincode: string;
+     *   category: Accessory.Categories;
+     * }} info - Required info for publishing.
+     * @param {boolean} allowInsecureRequest - Will allow unencrypted and unauthenticated access to the http server
      */
-    Accessory.prototype.publish = function (info, allowInsecureRequest) {
-        var _a, _b, _c;
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var service, config, parsed, selectedAdvertiser, _d, _e, _f;
-            var _this = this;
-            return tslib_1.__generator(this, function (_g) {
-                switch (_g.label) {
-                    case 0:
-                        if (this.bridged) {
-                            throw new Error("Can't publish in accessory which is bridged by another accessory. Bridged by " + ((_a = this.bridge) === null || _a === void 0 ? void 0 : _a.displayName));
-                        }
-                        // noinspection JSDeprecatedSymbols
-                        if (!info.advertiser && info.useLegacyAdvertiser != null) {
-                            // noinspection JSDeprecatedSymbols
-                            info.advertiser = info.useLegacyAdvertiser ? "bonjour-hap" /* MDNSAdvertiser.BONJOUR */ : "ciao" /* MDNSAdvertiser.CIAO */;
-                            console.warn("DEPRECATED The PublishInfo.useLegacyAdvertiser option has been removed. " +
-                                "Please use the PublishInfo.advertiser property to enable \"ciao\" (useLegacyAdvertiser=false) " +
-                                "or \"bonjour-hap\" (useLegacyAdvertiser=true) mdns advertiser libraries!");
-                        }
-                        // noinspection JSDeprecatedSymbols
-                        if (info.mdns && info.advertiser !== "bonjour-hap" /* MDNSAdvertiser.BONJOUR */) {
-                            console.log("DEPRECATED user supplied a custom 'mdns' option. This option is deprecated and ignored. " +
-                                "Please move to the new 'bind' option.");
-                        }
-                        service = this.getService(Service_1.Service.ProtocolInformation);
-                        if (!service) {
-                            service = this.addService(Service_1.Service.ProtocolInformation); // add the protocol information service to the primary accessory
-                        }
-                        service.setCharacteristic(Characteristic_1.Characteristic.Version, Advertiser_1.CiaoAdvertiser.protocolVersionService);
-                        if (this.lastKnownUsername && this.lastKnownUsername !== info.username) { // username changed since last publish
-                            Accessory.cleanupAccessoryData(this.lastKnownUsername); // delete old Accessory data
-                        }
-                        if (!this.initialized && ((_b = info.addIdentifyingMaterial) !== null && _b !== void 0 ? _b : true)) {
-                            // adding some identifying material to our displayName if it's our first publish() call
-                            this.displayName = this.displayName + " " + crypto_1.default.createHash("sha512")
-                                .update(info.username, "utf8")
-                                .digest("hex").slice(0, 4).toUpperCase();
-                            this.getService(Service_1.Service.AccessoryInformation).updateCharacteristic(Characteristic_1.Characteristic.Name, this.displayName);
-                        }
-                        // attempt to load existing AccessoryInfo from disk
-                        this._accessoryInfo = AccessoryInfo_1.AccessoryInfo.load(info.username);
-                        // if we don't have one, create a new one.
-                        if (!this._accessoryInfo) {
-                            debug("[%s] Creating new AccessoryInfo for our HAP server", this.displayName);
-                            this._accessoryInfo = AccessoryInfo_1.AccessoryInfo.create(info.username);
-                        }
-                        if (info.setupID) {
-                            this._setupID = info.setupID;
-                        }
-                        else if (this._accessoryInfo.setupID === undefined || this._accessoryInfo.setupID === "") {
-                            this._setupID = Accessory._generateSetupID();
-                        }
-                        else {
-                            this._setupID = this._accessoryInfo.setupID;
-                        }
-                        this._accessoryInfo.setupID = this._setupID;
-                        // make sure we have up-to-date values in AccessoryInfo, then save it in case they changed (or if we just created it)
-                        this._accessoryInfo.displayName = this.displayName;
-                        this._accessoryInfo.model = this.getService(Service_1.Service.AccessoryInformation).getCharacteristic(Characteristic_1.Characteristic.Model).value;
-                        this._accessoryInfo.category = info.category || 1 /* Categories.OTHER */;
-                        this._accessoryInfo.pincode = info.pincode;
-                        this._accessoryInfo.save();
-                        // create our IdentifierCache, so we can provide clients with stable aid/iid's
-                        this._identifierCache = IdentifierCache_1.IdentifierCache.load(info.username);
-                        // if we don't have one, create a new one.
-                        if (!this._identifierCache) {
-                            debug("[%s] Creating new IdentifierCache", this.displayName);
-                            this._identifierCache = new IdentifierCache_1.IdentifierCache(info.username);
-                        }
-                        // If it's bridge and there are no accessories already assigned to the bridge
-                        // probably purge is not needed since it's going to delete all the ids
-                        // of accessories that might be added later. Useful when dynamically adding
-                        // accessories.
-                        if (this._isBridge && this.bridgedAccessories.length === 0) {
-                            this.disableUnusedIDPurge();
-                            this.controllerStorage.purgeUnidentifiedAccessoryData = false;
-                        }
-                        if (!this.initialized) { // controller storage is only loaded from disk the first time we publish!
-                            this.controllerStorage.load(info.username); // initializing controller data
-                        }
-                        // assign aid/iid
-                        this._assignIDs(this._identifierCache);
-                        config = this.internalHAPRepresentation(false);
-                        // TODO queue this check until about 5 seconds after startup, allowing some last changes after the publish call
-                        //   without constantly incrementing the current config number
-                        this._accessoryInfo.checkForCurrentConfigurationNumberIncrement(config, true);
-                        this.validateAccessory(true);
-                        parsed = Accessory.parseBindOption(info);
-                        selectedAdvertiser = (_c = info.advertiser) !== null && _c !== void 0 ? _c : "bonjour-hap" /* MDNSAdvertiser.BONJOUR */;
-                        _e = info.advertiser === "avahi" /* MDNSAdvertiser.AVAHI */;
-                        if (!_e) return [3 /*break*/, 2];
-                        return [4 /*yield*/, Advertiser_1.AvahiAdvertiser.isAvailable()];
-                    case 1:
-                        _e = !(_g.sent());
-                        _g.label = 2;
-                    case 2:
-                        _d = (_e);
-                        if (_d) return [3 /*break*/, 5];
-                        _f = info.advertiser === "resolved" /* MDNSAdvertiser.RESOLVED */;
-                        if (!_f) return [3 /*break*/, 4];
-                        return [4 /*yield*/, Advertiser_1.ResolvedAdvertiser.isAvailable()];
-                    case 3:
-                        _f = !(_g.sent());
-                        _g.label = 4;
-                    case 4:
-                        _d = (_f);
-                        _g.label = 5;
-                    case 5:
-                        if (_d) {
-                            console.error("[".concat(this.displayName, "] The selected advertiser, \"").concat(info.advertiser, "\", isn't available on this platform. ") +
-                                "Reverting to \"".concat("bonjour-hap" /* MDNSAdvertiser.BONJOUR */, "\""));
-                            selectedAdvertiser = "bonjour-hap" /* MDNSAdvertiser.BONJOUR */;
-                        }
-                        switch (selectedAdvertiser) {
-                            case "ciao" /* MDNSAdvertiser.CIAO */:
-                                this._advertiser = new Advertiser_1.CiaoAdvertiser(this._accessoryInfo, {
-                                    interface: parsed.advertiserAddress,
-                                }, {
-                                    restrictedAddresses: parsed.serviceRestrictedAddress,
-                                    disabledIpv6: parsed.serviceDisableIpv6,
-                                });
-                                break;
-                            case "bonjour-hap" /* MDNSAdvertiser.BONJOUR */:
-                                // noinspection JSDeprecatedSymbols
-                                this._advertiser = new Advertiser_1.BonjourHAPAdvertiser(this._accessoryInfo, info.mdns, {
-                                    restrictedAddresses: parsed.serviceRestrictedAddress,
-                                    disabledIpv6: parsed.serviceDisableIpv6,
-                                });
-                                break;
-                            case "avahi" /* MDNSAdvertiser.AVAHI */:
-                                this._advertiser = new Advertiser_1.AvahiAdvertiser(this._accessoryInfo);
-                                break;
-                            case "resolved" /* MDNSAdvertiser.RESOLVED */:
-                                this._advertiser = new Advertiser_1.ResolvedAdvertiser(this._accessoryInfo);
-                                break;
-                            default:
-                                throw new Error("Unsupported advertiser setting: '" + info.advertiser + "'");
-                        }
-                        this._advertiser.on("updated-name" /* AdvertiserEvent.UPDATED_NAME */, function (name) {
-                            _this.displayName = name;
-                            if (_this._accessoryInfo) {
-                                _this._accessoryInfo.displayName = name;
-                                _this._accessoryInfo.save();
-                            }
-                            // bonjour service name MUST match the name in the accessory information service
-                            _this.getService(Service_1.Service.AccessoryInformation)
-                                .updateCharacteristic(Characteristic_1.Characteristic.Name, name);
-                        });
-                        // create our HAP server which handles all communication between iOS devices and us
-                        this._server = new HAPServer_1.HAPServer(this._accessoryInfo);
-                        this._server.allowInsecureRequest = !!allowInsecureRequest;
-                        this._server.on("listening" /* HAPServerEventTypes.LISTENING */, this.onListening.bind(this));
-                        this._server.on("identify" /* HAPServerEventTypes.IDENTIFY */, this.identificationRequest.bind(this, false));
-                        this._server.on("pair" /* HAPServerEventTypes.PAIR */, this.handleInitialPairSetupFinished.bind(this));
-                        this._server.on("add-pairing" /* HAPServerEventTypes.ADD_PAIRING */, this.handleAddPairing.bind(this));
-                        this._server.on("remove-pairing" /* HAPServerEventTypes.REMOVE_PAIRING */, this.handleRemovePairing.bind(this));
-                        this._server.on("list-pairings" /* HAPServerEventTypes.LIST_PAIRINGS */, this.handleListPairings.bind(this));
-                        this._server.on("accessories" /* HAPServerEventTypes.ACCESSORIES */, this.handleAccessories.bind(this));
-                        this._server.on("get-characteristics" /* HAPServerEventTypes.GET_CHARACTERISTICS */, this.handleGetCharacteristics.bind(this));
-                        this._server.on("set-characteristics" /* HAPServerEventTypes.SET_CHARACTERISTICS */, this.handleSetCharacteristics.bind(this));
-                        this._server.on("connection-closed" /* HAPServerEventTypes.CONNECTION_CLOSED */, this.handleHAPConnectionClosed.bind(this));
-                        this._server.on("request-resource" /* HAPServerEventTypes.REQUEST_RESOURCE */, this.handleResource.bind(this));
-                        this._server.listen(info.port, parsed.serverAddress);
-                        this.initialized = true;
-                        return [2 /*return*/];
-                }
-            });
+    async publish(info, allowInsecureRequest) {
+        if (this.bridged) {
+            throw new Error("Can't publish in accessory which is bridged by another accessory. Bridged by " + this.bridge?.displayName);
+        }
+        let service = this.getService(Service_1.Service.ProtocolInformation);
+        if (!service) {
+            service = this.addService(Service_1.Service.ProtocolInformation); // add the protocol information service to the primary accessory
+        }
+        service.setCharacteristic(Characteristic_1.Characteristic.Version, Advertiser_1.CiaoAdvertiser.protocolVersionService);
+        if (this.lastKnownUsername && this.lastKnownUsername !== info.username) { // username changed since last publish
+            Accessory.cleanupAccessoryData(this.lastKnownUsername); // delete old Accessory data
+        }
+        if (!this.initialized && (info.addIdentifyingMaterial ?? true)) {
+            // adding some identifying material to our displayName if it's our first publish() call
+            this.displayName = this.displayName + " " + crypto_1.default.createHash("sha512")
+                .update(info.username, "utf8")
+                .digest("hex").slice(0, 4).toUpperCase();
+            this.getService(Service_1.Service.AccessoryInformation).updateCharacteristic(Characteristic_1.Characteristic.Name, this.displayName);
+        }
+        // attempt to load existing AccessoryInfo from disk
+        this._accessoryInfo = AccessoryInfo_1.AccessoryInfo.load(info.username);
+        // if we don't have one, create a new one.
+        if (!this._accessoryInfo) {
+            debug("[%s] Creating new AccessoryInfo for our HAP server", this.displayName);
+            this._accessoryInfo = AccessoryInfo_1.AccessoryInfo.create(info.username);
+        }
+        if (info.setupID) {
+            this._setupID = info.setupID;
+        }
+        else if (this._accessoryInfo.setupID === undefined || this._accessoryInfo.setupID === "") {
+            this._setupID = Accessory._generateSetupID();
+        }
+        else {
+            this._setupID = this._accessoryInfo.setupID;
+        }
+        this._accessoryInfo.setupID = this._setupID;
+        // make sure we have up-to-date values in AccessoryInfo, then save it in case they changed (or if we just created it)
+        this._accessoryInfo.displayName = this.displayName;
+        this._accessoryInfo.model = this.getService(Service_1.Service.AccessoryInformation).getCharacteristic(Characteristic_1.Characteristic.Model).value;
+        this._accessoryInfo.category = info.category || 1 /* Categories.OTHER */;
+        this._accessoryInfo.pincode = info.pincode;
+        this._accessoryInfo.save();
+        // create our IdentifierCache, so we can provide clients with stable aid/iid's
+        this._identifierCache = IdentifierCache_1.IdentifierCache.load(info.username);
+        // if we don't have one, create a new one.
+        if (!this._identifierCache) {
+            debug("[%s] Creating new IdentifierCache", this.displayName);
+            this._identifierCache = new IdentifierCache_1.IdentifierCache(info.username);
+        }
+        // If it's bridge and there are no accessories already assigned to the bridge
+        // probably purge is not needed since it's going to delete all the ids
+        // of accessories that might be added later. Useful when dynamically adding
+        // accessories.
+        if (this._isBridge && this.bridgedAccessories.length === 0) {
+            this.disableUnusedIDPurge();
+            this.controllerStorage.purgeUnidentifiedAccessoryData = false;
+        }
+        if (!this.initialized) { // controller storage is only loaded from disk the first time we publish!
+            this.controllerStorage.load(info.username); // initializing controller data
+        }
+        // assign aid/iid
+        this._assignIDs(this._identifierCache);
+        // get our accessory information in HAP format and determine if our configuration (that is, our
+        // Accessories/Services/Characteristics) has changed since the last time we were published. make
+        // sure to omit actual values since these are not part of the "configuration".
+        const config = this.internalHAPRepresentation(false); // TODO ensure this stuff is ordered
+        // TODO queue this check until about 5 seconds after startup, allowing some last changes after the publish call
+        //   without constantly incrementing the current config number
+        this._accessoryInfo.checkForCurrentConfigurationNumberIncrement(config, true);
+        this.validateAccessory(true);
+        // create our Advertiser which broadcasts our presence over mdns
+        const parsed = Accessory.parseBindOption(info);
+        let selectedAdvertiser = info.advertiser ?? "bonjour-hap" /* MDNSAdvertiser.BONJOUR */;
+        if ((info.advertiser === "avahi" /* MDNSAdvertiser.AVAHI */ && !await Advertiser_1.AvahiAdvertiser.isAvailable()) ||
+            (info.advertiser === "resolved" /* MDNSAdvertiser.RESOLVED */ && !await Advertiser_1.ResolvedAdvertiser.isAvailable())) {
+            console.error(`[${this.displayName}] The selected advertiser, "${info.advertiser}", isn't available on this platform. ` +
+                `Reverting to "${"bonjour-hap" /* MDNSAdvertiser.BONJOUR */}"`);
+            selectedAdvertiser = "bonjour-hap" /* MDNSAdvertiser.BONJOUR */;
+        }
+        switch (selectedAdvertiser) {
+            case "ciao" /* MDNSAdvertiser.CIAO */:
+                this._advertiser = new Advertiser_1.CiaoAdvertiser(this._accessoryInfo, {
+                    interface: parsed.advertiserAddress,
+                }, {
+                    restrictedAddresses: parsed.serviceRestrictedAddress,
+                    disabledIpv6: parsed.serviceDisableIpv6,
+                });
+                break;
+            case "bonjour-hap" /* MDNSAdvertiser.BONJOUR */:
+                this._advertiser = new Advertiser_1.BonjourHAPAdvertiser(this._accessoryInfo, {
+                    restrictedAddresses: parsed.serviceRestrictedAddress,
+                    disabledIpv6: parsed.serviceDisableIpv6,
+                });
+                break;
+            case "avahi" /* MDNSAdvertiser.AVAHI */:
+                this._advertiser = new Advertiser_1.AvahiAdvertiser(this._accessoryInfo);
+                break;
+            case "resolved" /* MDNSAdvertiser.RESOLVED */:
+                this._advertiser = new Advertiser_1.ResolvedAdvertiser(this._accessoryInfo);
+                break;
+            default:
+                throw new Error("Unsupported advertiser setting: '" + info.advertiser + "'");
+        }
+        this._advertiser.on("updated-name" /* AdvertiserEvent.UPDATED_NAME */, name => {
+            this.displayName = name;
+            if (this._accessoryInfo) {
+                this._accessoryInfo.displayName = name;
+                this._accessoryInfo.save();
+            }
+            // bonjour service name MUST match the name in the accessory information service
+            this.getService(Service_1.Service.AccessoryInformation)
+                .updateCharacteristic(Characteristic_1.Characteristic.Name, name);
         });
-    };
+        // create our HAP server which handles all communication between iOS devices and us
+        this._server = new HAPServer_1.HAPServer(this._accessoryInfo);
+        this._server.allowInsecureRequest = !!allowInsecureRequest;
+        this._server.on("listening" /* HAPServerEventTypes.LISTENING */, this.onListening.bind(this));
+        this._server.on("identify" /* HAPServerEventTypes.IDENTIFY */, this.identificationRequest.bind(this, false));
+        this._server.on("pair" /* HAPServerEventTypes.PAIR */, this.handleInitialPairSetupFinished.bind(this));
+        this._server.on("add-pairing" /* HAPServerEventTypes.ADD_PAIRING */, this.handleAddPairing.bind(this));
+        this._server.on("remove-pairing" /* HAPServerEventTypes.REMOVE_PAIRING */, this.handleRemovePairing.bind(this));
+        this._server.on("list-pairings" /* HAPServerEventTypes.LIST_PAIRINGS */, this.handleListPairings.bind(this));
+        this._server.on("accessories" /* HAPServerEventTypes.ACCESSORIES */, this.handleAccessories.bind(this));
+        this._server.on("get-characteristics" /* HAPServerEventTypes.GET_CHARACTERISTICS */, this.handleGetCharacteristics.bind(this));
+        this._server.on("set-characteristics" /* HAPServerEventTypes.SET_CHARACTERISTICS */, this.handleSetCharacteristics.bind(this));
+        this._server.on("connection-closed" /* HAPServerEventTypes.CONNECTION_CLOSED */, this.handleHAPConnectionClosed.bind(this));
+        this._server.on("request-resource" /* HAPServerEventTypes.REQUEST_RESOURCE */, this.handleResource.bind(this));
+        this._server.listen(info.port, parsed.serverAddress);
+        this.initialized = true;
+    }
     /**
      * Removes this Accessory from the local network
      * Accessory object will no longer valid after invoking this method
      * Trying to invoke publish() on the object will result undefined behavior
      */
-    Accessory.prototype.destroy = function () {
-        var promise = this.unpublish();
+    destroy() {
+        const promise = this.unpublish();
         if (this._accessoryInfo) {
             Accessory.cleanupAccessoryData(this._accessoryInfo.username);
             this._accessoryInfo = undefined;
@@ -1107,44 +892,31 @@ var Accessory = /** @class */ (function (_super) {
         }
         this.removeAllListeners();
         return promise;
-    };
-    Accessory.prototype.unpublish = 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._server) {
-                            this._server.destroy();
-                            this._server = undefined;
-                        }
-                        if (!this._advertiser) return [3 /*break*/, 2];
-                        // noinspection JSIgnoredPromiseFromCall
-                        return [4 /*yield*/, this._advertiser.destroy()];
-                    case 1:
-                        // noinspection JSIgnoredPromiseFromCall
-                        _a.sent();
-                        this._advertiser = undefined;
-                        _a.label = 2;
-                    case 2: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    Accessory.prototype.enqueueConfigurationUpdate = function () {
-        var _this = this;
+    }
+    async unpublish() {
+        if (this._server) {
+            this._server.destroy();
+            this._server = undefined;
+        }
+        if (this._advertiser) {
+            // noinspection JSIgnoredPromiseFromCall
+            await this._advertiser.destroy();
+            this._advertiser = undefined;
+        }
+    }
+    enqueueConfigurationUpdate() {
         if (this.configurationChangeDebounceTimeout) {
             return; // already enqueued
         }
-        this.configurationChangeDebounceTimeout = setTimeout(function () {
-            var _a;
-            _this.configurationChangeDebounceTimeout = undefined;
-            if (_this._advertiser && _this._advertiser) {
+        this.configurationChangeDebounceTimeout = setTimeout(() => {
+            this.configurationChangeDebounceTimeout = undefined;
+            if (this._advertiser && this._advertiser) {
                 // get our accessory information in HAP format and determine if our configuration (that is, our
                 // Accessories/Services/Characteristics) has changed since the last time we were published. make
                 // sure to omit actual values since these are not part of the "configuration".
-                var config = _this.internalHAPRepresentation(); // TODO ensure this stuff is ordered
-                if ((_a = _this._accessoryInfo) === null || _a === void 0 ? void 0 : _a.checkForCurrentConfigurationNumberIncrement(config)) {
-                    _this._advertiser.updateAdvertisement();
+                const config = this.internalHAPRepresentation(); // TODO ensure this stuff is ordered
+                if (this._accessoryInfo?.checkForCurrentConfigurationNumberIncrement(config)) {
+                    this._advertiser.updateAdvertisement();
                 }
             }
         }, 1000);
@@ -1152,18 +924,22 @@ var Accessory = /** @class */ (function (_super) {
         // 1s is fine, HomeKit is built that with configuration updates no iid or aid conflicts occur.
         // Thus, the only thing happening when the txt update arrives late is already removed accessories/services
         // not responding or new accessories/services not yet shown
-    };
-    Accessory.prototype.onListening = function (port, hostname) {
-        var _this = this;
+    }
+    onListening(port, hostname) {
         (0, assert_1.default)(this._advertiser, "Advertiser wasn't created at onListening!");
         // the HAP server is listening, so we can now start advertising our presence.
         this._advertiser.initPort(port);
         this._advertiser.startAdvertising()
-            .then(function () { return _this.emit("advertised" /* AccessoryEventTypes.ADVERTISED */); })
-            .catch(function (reason) { return console.error("Could not create mDNS advertisement. The HAP-Server won't be discoverable: " + reason); });
+            .then(() => this.emit("advertised" /* AccessoryEventTypes.ADVERTISED */))
+            .catch(reason => {
+            console.error("Could not create mDNS advertisement. The HAP-Server won't be discoverable: " + reason);
+            if (reason.stack) {
+                debug("Detailed error: " + reason.stack);
+            }
+        });
         this.emit("listening" /* AccessoryEventTypes.LISTENING */, port, hostname);
-    };
-    Accessory.prototype.handleInitialPairSetupFinished = function (username, publicKey, callback) {
+    }
+    handleInitialPairSetupFinished(username, publicKey, callback) {
         debug("[%s] Paired with client %s", this.displayName, username);
         this._accessoryInfo && this._accessoryInfo.addPairedClient(username, publicKey, 1 /* PermissionTypes.ADMIN */);
         this._accessoryInfo && this._accessoryInfo.save();
@@ -1171,8 +947,8 @@ var Accessory = /** @class */ (function (_super) {
         this._advertiser && this._advertiser.updateAdvertisement();
         callback();
         this.emit("paired" /* AccessoryEventTypes.PAIRED */);
-    };
-    Accessory.prototype.handleAddPairing = function (connection, username, publicKey, permission, callback) {
+    }
+    handleAddPairing(connection, username, publicKey, permission, callback) {
         if (!this._accessoryInfo) {
             callback(6 /* TLVErrorCode.UNAVAILABLE */);
             return;
@@ -1181,7 +957,7 @@ var Accessory = /** @class */ (function (_super) {
             callback(2 /* TLVErrorCode.AUTHENTICATION */);
             return;
         }
-        var existingKey = this._accessoryInfo.getClientPublicKey(username);
+        const existingKey = this._accessoryInfo.getClientPublicKey(username);
         if (existingKey) {
             if (existingKey.toString() !== publicKey.toString()) {
                 callback(1 /* TLVErrorCode.UNKNOWN */);
@@ -1195,9 +971,8 @@ var Accessory = /** @class */ (function (_super) {
         this._accessoryInfo.save();
         // there should be no need to update advertisement
         callback(0);
-    };
-    Accessory.prototype.handleRemovePairing = function (connection, username, callback) {
-        var e_12, _a;
+    }
+    handleRemovePairing(connection, username, callback) {
         if (!this._accessoryInfo) {
             callback(6 /* TLVErrorCode.UNAVAILABLE */);
             return;
@@ -1213,22 +988,12 @@ var Accessory = /** @class */ (function (_super) {
             this._advertiser && this._advertiser.updateAdvertisement();
             this.emit("unpaired" /* AccessoryEventTypes.UNPAIRED */);
             this.handleAccessoryUnpairedForControllers();
-            try {
-                for (var _b = tslib_1.__values(this.bridgedAccessories), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var accessory = _c.value;
-                    accessory.handleAccessoryUnpairedForControllers();
-                }
-            }
-            catch (e_12_1) { e_12 = { error: e_12_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                }
-                finally { if (e_12) throw e_12.error; }
+            for (const accessory of this.bridgedAccessories) {
+                accessory.handleAccessoryUnpairedForControllers();
             }
         }
-    };
-    Accessory.prototype.handleListPairings = function (connection, callback) {
+    }
+    handleListPairings(connection, callback) {
         if (!this._accessoryInfo) {
             callback(6 /* TLVErrorCode.UNAVAILABLE */);
             return;
@@ -1238,82 +1003,57 @@ var Accessory = /** @class */ (function (_super) {
             return;
         }
         callback(0, this._accessoryInfo.listPairings());
-    };
-    Accessory.prototype.handleAccessories = function (connection, callback) {
-        var _this = this;
+    }
+    handleAccessories(connection, callback) {
         this._assignIDs(this._identifierCache); // make sure our aid/iid's are all assigned
-        var now = Date.now();
-        var contactGetHandlers = now - this.lastAccessoriesRequest > 5000; // we query the latest value if last /accessories was more than 5s ago
+        const now = Date.now();
+        const contactGetHandlers = now - this.lastAccessoriesRequest > 5_000; // we query the latest value if last /accessories was more than 5s ago
         this.lastAccessoriesRequest = now;
-        this.toHAP(connection, contactGetHandlers).then(function (value) {
+        this.toHAP(connection, contactGetHandlers).then(value => {
             callback(undefined, {
                 accessories: value,
             });
-        }, function (reason) {
-            console.error("[" + _this.displayName + "] /accessories request error with: " + reason.stack);
+        }, reason => {
+            console.error("[" + this.displayName + "] /accessories request error with: " + reason.stack);
             callback({ httpCode: 500 /* HAPHTTPCode.INTERNAL_SERVER_ERROR */, status: -70402 /* HAPStatus.SERVICE_COMMUNICATION_FAILURE */ });
         });
-    };
-    Accessory.prototype.handleGetCharacteristics = function (connection, request, callback) {
-        var e_13, _a;
-        var _this = this;
-        var characteristics = [];
-        var response = { characteristics: characteristics };
-        var missingCharacteristics = new Set(request.ids.map(function (id) { return id.aid + "." + id.iid; }));
+    }
+    handleGetCharacteristics(connection, request, callback) {
+        const characteristics = [];
+        const response = { characteristics: characteristics };
+        const missingCharacteristics = new Set(request.ids.map(id => id.aid + "." + id.iid));
         if (missingCharacteristics.size !== request.ids.length) {
             // if those sizes differ, we have duplicates and can't properly handle that
             callback({ httpCode: 422 /* HAPHTTPCode.UNPROCESSABLE_ENTITY */, status: -70410 /* HAPStatus.INVALID_VALUE_IN_REQUEST */ });
             return;
         }
-        var timeout = setTimeout(function () {
-            var e_14, _a;
-            try {
-                for (var missingCharacteristics_1 = tslib_1.__values(missingCharacteristics), missingCharacteristics_1_1 = missingCharacteristics_1.next(); !missingCharacteristics_1_1.done; missingCharacteristics_1_1 = missingCharacteristics_1.next()) {
-                    var id = missingCharacteristics_1_1.value;
-                    var split = id.split(".");
-                    var aid = parseInt(split[0], 10);
-                    var iid = parseInt(split[1], 10);
-                    var accessory = _this.getAccessoryByAID(aid);
-                    var characteristic = accessory.getCharacteristicByIID(iid);
-                    _this.sendCharacteristicWarning(characteristic, "slow-read" /* CharacteristicWarningType.SLOW_READ */, "The read handler for the characteristic '" +
-                        characteristic.displayName + "' on the accessory '" + accessory.displayName + "' was slow to respond!");
-                }
-            }
-            catch (e_14_1) { e_14 = { error: e_14_1 }; }
-            finally {
-                try {
-                    if (missingCharacteristics_1_1 && !missingCharacteristics_1_1.done && (_a = missingCharacteristics_1.return)) _a.call(missingCharacteristics_1);
-                }
-                finally { if (e_14) throw e_14.error; }
+        let timeout = setTimeout(() => {
+            for (const id of missingCharacteristics) {
+                const split = id.split(".");
+                const aid = parseInt(split[0], 10);
+                const iid = parseInt(split[1], 10);
+                const accessory = this.getAccessoryByAID(aid);
+                const characteristic = accessory.getCharacteristicByIID(iid);
+                this.sendCharacteristicWarning(characteristic, "slow-read" /* CharacteristicWarningType.SLOW_READ */, "The read handler for the characteristic '" +
+                    characteristic.displayName + "' on the accessory '" + accessory.displayName + "' was slow to respond!");
             }
             // after a total of 10s we do no longer wait for a request to appear and just return status code timeout
-            timeout = setTimeout(function () {
-                var e_15, _a;
+            timeout = setTimeout(() => {
                 timeout = undefined;
-                try {
-                    for (var missingCharacteristics_2 = tslib_1.__values(missingCharacteristics), missingCharacteristics_2_1 = missingCharacteristics_2.next(); !missingCharacteristics_2_1.done; missingCharacteristics_2_1 = missingCharacteristics_2.next()) {
-                        var id = missingCharacteristics_2_1.value;
-                        var split = id.split(".");
-                        var aid = parseInt(split[0], 10);
-                        var iid = parseInt(split[1], 10);
-                        var accessory = _this.getAccessoryByAID(aid);
-                        var characteristic = accessory.getCharacteristicByIID(iid);
-                        _this.sendCharacteristicWarning(characteristic, "timeout-read" /* CharacteristicWarningType.TIMEOUT_READ */, "The read handler for the characteristic '" +
-                            characteristic.displayName + "' on the accessory '" + accessory.displayName + "' didn't respond at all!. " +
-                            "Please check that you properly call the callback!");
-                        characteristics.push({
-                            aid: aid,
-                            iid: iid,
-                            status: -70408 /* HAPStatus.OPERATION_TIMED_OUT */,
-                        });
-                    }
-                }
-                catch (e_15_1) { e_15 = { error: e_15_1 }; }
-                finally {
-                    try {
-                        if (missingCharacteristics_2_1 && !missingCharacteristics_2_1.done && (_a = missingCharacteristics_2.return)) _a.call(missingCharacteristics_2);
-                    }
-                    finally { if (e_15) throw e_15.error; }
+                for (const id of missingCharacteristics) {
+                    const split = id.split(".");
+                    const aid = parseInt(split[0], 10);
+                    const iid = parseInt(split[1], 10);
+                    const accessory = this.getAccessoryByAID(aid);
+                    const characteristic = accessory.getCharacteristicByIID(iid);
+                    this.sendCharacteristicWarning(characteristic, "timeout-read" /* CharacteristicWarningType.TIMEOUT_READ */, "The read handler for the characteristic '" +
+                        characteristic.displayName + "' on the accessory '" + accessory.displayName + "' didn't respond at all!. " +
+                        "Please check that you properly call the callback!");
+                    characteristics.push({
+                        aid: aid,
+                        iid: iid,
+                        status: -70408 /* HAPStatus.OPERATION_TIMED_OUT */,
+                    });
                 }
                 missingCharacteristics.clear();
                 callback(undefined, response);
@@ -1321,18 +1061,22 @@ var Accessory = /** @class */ (function (_super) {
             timeout.unref();
         }, Accessory.TIMEOUT_WARNING);
         timeout.unref();
-        var _loop_1 = function (id) {
-            var name = id.aid + "." + id.iid;
-            this_1.handleCharacteristicRead(connection, id, request).then(function (value) {
-                return tslib_1.__assign({ aid: id.aid, iid: id.iid }, value);
-            }, function (reason) {
-                console.error("[".concat(_this.displayName, "] Read request for characteristic ").concat(name, " encountered an error: ").concat(reason.stack));
+        for (const id of request.ids) {
+            const name = id.aid + "." + id.iid;
+            this.handleCharacteristicRead(connection, id, request).then(value => {
+                return {
+                    aid: id.aid,
+                    iid: id.iid,
+                    ...value,
+                };
+            }, reason => {
+                console.error(`[${this.displayName}] Read request for characteristic ${name} encountered an error: ${reason.stack}`);
                 return {
                     aid: id.aid,
                     iid: id.iid,
                     status: -70402 /* HAPStatus.SERVICE_COMMUNICATION_FAILURE */,
                 };
-            }).then(function (value) {
+            }).then(value => {
                 if (!timeout) {
                     return; // if timeout is undefined, response was already sent out
                 }
@@ -1346,82 +1090,60 @@ var Accessory = /** @class */ (function (_super) {
                     callback(undefined, response);
                 }
             });
-        };
-        var this_1 = this;
-        try {
-            for (var _b = tslib_1.__values(request.ids), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var id = _c.value;
-                _loop_1(id);
-            }
-        }
-        catch (e_13_1) { e_13 = { error: e_13_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_13) throw e_13.error; }
         }
-    };
-    Accessory.prototype.handleCharacteristicRead = function (connection, id, request) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var characteristic, verifiable;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                characteristic = this.findCharacteristic(id.aid, id.iid);
-                if (!characteristic) {
-                    debug("[%s] Could not find a Characteristic with aid of %s and iid of %s", this.displayName, id.aid, id.iid);
-                    return [2 /*return*/, { status: -70410 /* HAPStatus.INVALID_VALUE_IN_REQUEST */ }];
-                }
-                if (!characteristic.props.perms.includes("pr" /* Perms.PAIRED_READ */)) { // check if read is allowed for this characteristic
-                    debug("[%s] Tried reading from characteristic which does not allow reading (aid of %s and iid of %s)", this.displayName, id.aid, id.iid);
-                    return [2 /*return*/, { status: -70405 /* HAPStatus.WRITE_ONLY_CHARACTERISTIC */ }];
-                }
-                if (characteristic.props.adminOnlyAccess && characteristic.props.adminOnlyAccess.includes(0 /* Access.READ */)) {
-                    verifiable = this._accessoryInfo && connection.username;
-                    if (!verifiable) {
-                        debug("[%s] Could not verify admin permissions for Characteristic which requires admin permissions for reading (aid of %s and iid of %s)", this.displayName, id.aid, id.iid);
-                    }
-                    if (!verifiable || !this._accessoryInfo.hasAdminPermissions(connection.username)) {
-                        return [2 /*return*/, { status: -70401 /* HAPStatus.INSUFFICIENT_PRIVILEGES */ }];
-                    }
-                }
-                return [2 /*return*/, characteristic.handleGetRequest(connection).then(function (value) {
-                        value = (0, request_util_1.formatOutgoingCharacteristicValue)(value, characteristic.props);
-                        debug("[%s] Got Characteristic \"%s\" value: \"%s\"", _this.displayName, characteristic.displayName, value);
-                        var data = {
-                            value: value == null ? null : value,
-                        };
-                        if (request.includeMeta) {
-                            data.format = characteristic.props.format;
-                            data.unit = characteristic.props.unit;
-                            data.minValue = characteristic.props.minValue;
-                            data.maxValue = characteristic.props.maxValue;
-                            data.minStep = characteristic.props.minStep;
-                            data.maxLen = characteristic.props.maxLen || characteristic.props.maxDataLen;
-                        }
-                        if (request.includePerms) {
-                            data.perms = characteristic.props.perms;
-                        }
-                        if (request.includeType) {
-                            data.type = (0, uuid_1.toShortForm)(characteristic.UUID);
-                        }
-                        if (request.includeEvent) {
-                            data.ev = connection.hasEventNotifications(id.aid, id.iid);
-                        }
-                        return data;
-                    }, function (reason) {
-                        // @ts-expect-error: preserveConstEnums compiler option
-                        debug("[%s] Error getting value for characteristic \"%s\": %s", _this.displayName, characteristic.displayName, HAPServer_1.HAPStatus[reason]);
-                        return { status: reason };
-                    })];
-            });
+    }
+    async handleCharacteristicRead(connection, id, request) {
+        const characteristic = this.findCharacteristic(id.aid, id.iid);
+        if (!characteristic) {
+            debug("[%s] Could not find a Characteristic with aid of %s and iid of %s", this.displayName, id.aid, id.iid);
+            return { status: -70410 /* HAPStatus.INVALID_VALUE_IN_REQUEST */ };
+        }
+        if (!characteristic.props.perms.includes("pr" /* Perms.PAIRED_READ */)) { // check if read is allowed for this characteristic
+            debug("[%s] Tried reading from characteristic which does not allow reading (aid of %s and iid of %s)", this.displayName, id.aid, id.iid);
+            return { status: -70405 /* HAPStatus.WRITE_ONLY_CHARACTERISTIC */ };
+        }
+        if (characteristic.props.adminOnlyAccess && characteristic.props.adminOnlyAccess.includes(0 /* Access.READ */)) {
+            const verifiable = this._accessoryInfo && connection.username;
+            if (!verifiable) {
+                debug("[%s] Could not verify admin permissions for Characteristic which requires admin permissions for reading (aid of %s and iid of %s)", this.displayName, id.aid, id.iid);
+            }
+            if (!verifiable || !this._accessoryInfo.hasAdminPermissions(connection.username)) {
+                return { status: -70401 /* HAPStatus.INSUFFICIENT_PRIVILEGES */ };
+            }
+        }
+        return characteristic.handleGetRequest(connection).then(value => {
+            value = (0, request_util_1.formatOutgoingCharacteristicValue)(value, characteristic.props);
+            debug("[%s] Got Characteristic \"%s\" value: \"%s\"", this.displayName, characteristic.displayName, value);
+            const data = {
+                value: value == null ? null : value,
+            };
+            if (request.includeMeta) {
+                data.format = characteristic.props.format;
+                data.unit = characteristic.props.unit;
+                data.minValue = characteristic.props.minValue;
+                data.maxValue = characteristic.props.maxValue;
+                data.minStep = characteristic.props.minStep;
+                data.maxLen = characteristic.props.maxLen || characteristic.props.maxDataLen;
+            }
+            if (request.includePerms) {
+                data.perms = characteristic.props.perms;
+            }
+            if (request.includeType) {
+                data.type = (0, uuid_1.toShortForm)(characteristic.UUID);
+            }
+            if (request.includeEvent) {
+                data.ev = connection.hasEventNotifications(id.aid, id.iid);
+            }
+            return data;
+        }, (reason) => {
+            // @ts-expect-error: preserveConstEnums compiler option
+            debug("[%s] Error getting value for characteristic \"%s\": %s", this.displayName, characteristic.displayName, HAPServer_1.HAPStatus[reason]);
+            return { status: reason };
         });
-    };
-    Accessory.prototype.handleSetCharacteristics = function (connection, writeRequest, callback) {
-        var e_16, _a;
-        var _this = this;
+    }
+    handleSetCharacteristics(connection, writeRequest, callback) {
         debug("[%s] Processing characteristic set: %s", this.displayName, JSON.stringify(writeRequest));
-        var writeState = 0 /* WriteRequestState.REGULAR_REQUEST */;
+        let writeState = 0 /* WriteRequestState.REGULAR_REQUEST */;
         if (writeRequest.pid !== undefined) { // check for timed writes
             if (connection.timedWritePid === writeRequest.pid) {
                 writeState = 1 /* WriteRequestState.TIMED_WRITE_AUTHENTICATED */;
@@ -1435,64 +1157,42 @@ var Accessory = /** @class */ (function (_super) {
                 debug("[%s] TTL for timed write request has probably expired for pid %d", this.displayName, writeRequest.pid);
             }
         }
-        var characteristics = [];
-        var response = { characteristics: characteristics };
-        var missingCharacteristics = new Set(writeRequest.characteristics
-            .map(function (characteristic) { return characteristic.aid + "." + characteristic.iid; }));
+        const characteristics = [];
+        const response = { characteristics: characteristics };
+        const missingCharacteristics = new Set(writeRequest.characteristics
+            .map(characteristic => characteristic.aid + "." + characteristic.iid));
         if (missingCharacteristics.size !== writeRequest.characteristics.length) {
             // if those sizes differ, we have duplicates and can't properly handle that
             callback({ httpCode: 422 /* HAPHTTPCode.UNPROCESSABLE_ENTITY */, status: -70410 /* HAPStatus.INVALID_VALUE_IN_REQUEST */ });
             return;
         }
-        var timeout = setTimeout(function () {
-            var e_17, _a;
-            try {
-                for (var missingCharacteristics_3 = tslib_1.__values(missingCharacteristics), missingCharacteristics_3_1 = missingCharacteristics_3.next(); !missingCharacteristics_3_1.done; missingCharacteristics_3_1 = missingCharacteristics_3.next()) {
-                    var id = missingCharacteristics_3_1.value;
-                    var split = id.split(".");
-                    var aid = parseInt(split[0], 10);
-                    var iid = parseInt(split[1], 10);
-                    var accessory = _this.getAccessoryByAID(aid);
-                    var characteristic = accessory.getCharacteristicByIID(iid);
-                    _this.sendCharacteristicWarning(characteristic, "slow-write" /* CharacteristicWarningType.SLOW_WRITE */, "The write handler for the characteristic '" +
-                        characteristic.displayName + "' on the accessory '" + accessory.displayName + "' was slow to respond!");
-                }
-            }
-            catch (e_17_1) { e_17 = { error: e_17_1 }; }
-            finally {
-                try {
-                    if (missingCharacteristics_3_1 && !missingCharacteristics_3_1.done && (_a = missingCharacteristics_3.return)) _a.call(missingCharacteristics_3);
-                }
-                finally { if (e_17) throw e_17.error; }
+        let timeout = setTimeout(() => {
+            for (const id of missingCharacteristics) {
+                const split = id.split(".");
+                const aid = parseInt(split[0], 10);
+                const iid = parseInt(split[1], 10);
+                const accessory = this.getAccessoryByAID(aid);
+                const characteristic = accessory.getCharacteristicByIID(iid);
+                this.sendCharacteristicWarning(characteristic, "slow-write" /* CharacteristicWarningType.SLOW_WRITE */, "The write handler for the characteristic '" +
+                    characteristic.displayName + "' on the accessory '" + accessory.displayName + "' was slow to respond!");
             }
             // after a total of 10s we do no longer wait for a request to appear and just return status code timeout
-            timeout = setTimeout(function () {
-                var e_18, _a;
+            timeout = setTimeout(() => {
                 timeout = undefined;
-                try {
-                    for (var missingCharacteristics_4 = tslib_1.__values(missingCharacteristics), missingCharacteristics_4_1 = missingCharacteristics_4.next(); !missingCharacteristics_4_1.done; missingCharacteristics_4_1 = missingCharacteristics_4.next()) {
-                        var id = missingCharacteristics_4_1.value;
-                        var split = id.split(".");
-                        var aid = parseInt(split[0], 10);
-                        var iid = parseInt(split[1], 10);
-                        var accessory = _this.getAccessoryByAID(aid);
-                        var characteristic = accessory.getCharacteristicByIID(iid);
-                        _this.sendCharacteristicWarning(characteristic, "timeout-write" /* CharacteristicWarningType.TIMEOUT_WRITE */, "The write handler for the characteristic '" +
-                            characteristic.displayName + "' on the accessory '" + accessory.displayName + "' didn't respond at all!. " +
-                            "Please check that you properly call the callback!");
-                        characteristics.push({
-                            aid: aid,
-                            iid: iid,
-                            status: -70408 /* HAPStatus.OPERATION_TIMED_OUT */,
-                        });
-                    }
-                }
-                catch (e_18_1) { e_18 = { error: e_18_1 }; }
-                finally {
-                    try {
-                        if (missingCharacteristics_4_1 && !missingCharacteristics_4_1.done && (_a = missingCharacteristics_4.return)) _a.call(missingCharacteristics_4);
-                    }
-                    finally { if (e_18) throw e_18.error; }
+                for (const id of missingCharacteristics) {
+                    const split = id.split(".");
+                    const aid = parseInt(split[0], 10);
+                    const iid = parseInt(split[1], 10);
+                    const accessory = this.getAccessoryByAID(aid);
+                    const characteristic = accessory.getCharacteristicByIID(iid);
+                    this.sendCharacteristicWarning(characteristic, "timeout-write" /* CharacteristicWarningType.TIMEOUT_WRITE */, "The write handler for the characteristic '" +
+                        characteristic.displayName + "' on the accessory '" + accessory.displayName + "' didn't respond at all!. " +
+                        "Please check that you properly call the callback!");
+                    characteristics.push({
+                        aid: aid,
+                        iid: iid,
+                        status: -70408 /* HAPStatus.OPERATION_TIMED_OUT */,
+                    });
                 }
                 missingCharacteristics.clear();
                 callback(undefined, response);
@@ -1500,18 +1200,22 @@ var Accessory = /** @class */ (function (_super) {
             timeout.unref();
         }, Accessory.TIMEOUT_WARNING);
         timeout.unref();
-        var _loop_2 = function (data) {
-            var name = data.aid + "." + data.iid;
-            this_2.handleCharacteristicWrite(connection, data, writeState).then(function (value) {
-                return tslib_1.__assign({ aid: data.aid, iid: data.iid }, value);
-            }, function (reason) {
-                console.error("[".concat(_this.displayName, "] Write request for characteristic ").concat(name, " encountered an error: ").concat(reason.stack));
+        for (const data of writeRequest.characteristics) {
+            const name = data.aid + "." + data.iid;
+            this.handleCharacteristicWrite(connection, data, writeState).then(value => {
+                return {
+                    aid: data.aid,
+                    iid: data.iid,
+                    ...value,
+                };
+            }, reason => {
+                console.error(`[${this.displayName}] Write request for characteristic ${name} encountered an error: ${reason.stack}`);
                 return {
                     aid: data.aid,
                     iid: data.iid,
                     status: -70402 /* HAPStatus.SERVICE_COMMUNICATION_FAILURE */,
                 };
-            }).then(function (value) {
+            }).then(value => {
                 if (!timeout) {
                     return; // if timeout is undefined, response was already sent out
                 }
@@ -1525,119 +1229,100 @@ var Accessory = /** @class */ (function (_super) {
                     callback(undefined, response);
                 }
             });
-        };
-        var this_2 = this;
-        try {
-            for (var _b = tslib_1.__values(writeRequest.characteristics), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var data = _c.value;
-                _loop_2(data);
-            }
         }
-        catch (e_16_1) { e_16 = { error: e_16_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+    }
+    async handleCharacteristicWrite(connection, data, writeState) {
+        const characteristic = this.findCharacteristic(data.aid, data.iid);
+        if (!characteristic) {
+            debug("[%s] Could not find a Characteristic with aid of %s and iid of %s", this.displayName, data.aid, data.iid);
+            return { status: -70410 /* HAPStatus.INVALID_VALUE_IN_REQUEST */ };
+        }
+        if (writeState === 2 /* WriteRequestState.TIMED_WRITE_REJECTED */) {
+            return { status: -70410 /* HAPStatus.INVALID_VALUE_IN_REQUEST */ };
+        }
+        if (data.ev == null && data.value == null) {
+            return { status: -70410 /* HAPStatus.INVALID_VALUE_IN_REQUEST */ };
+        }
+        if (data.ev != null) { // register/unregister event notifications
+            if (!characteristic.props.perms.includes("ev" /* Perms.NOTIFY */)) { // check if notify is allowed for this characteristic
+                debug("[%s] Tried %s notifications for Characteristic which does not allow notify (aid of %s and iid of %s)", this.displayName, data.ev ? "enabling" : "disabling", data.aid, data.iid);
+                return { status: -70406 /* HAPStatus.NOTIFICATION_NOT_SUPPORTED */ };
+            }
+            if (characteristic.props.adminOnlyAccess && characteristic.props.adminOnlyAccess.includes(2 /* Access.NOTIFY */)) {
+                const verifiable = connection.username && this._accessoryInfo;
+                if (!verifiable) {
+                    debug("[%s] Could not verify admin permissions for Characteristic which requires admin permissions for notify (aid of %s and iid of %s)", this.displayName, data.aid, data.iid);
+                }
+                if (!verifiable || !this._accessoryInfo.hasAdminPermissions(connection.username)) {
+                    return { status: -70401 /* HAPStatus.INSUFFICIENT_PRIVILEGES */ };
+                }
+            }
+            const notificationsEnabled = connection.hasEventNotifications(data.aid, data.iid);
+            if (data.ev && !notificationsEnabled) {
+                connection.enableEventNotifications(data.aid, data.iid);
+                characteristic.subscribe();
+                debug("[%s] Registered Characteristic \"%s\" on \"%s\" for events", connection.remoteAddress, characteristic.displayName, this.displayName);
+            }
+            else if (!data.ev && notificationsEnabled) {
+                characteristic.unsubscribe();
+                connection.disableEventNotifications(data.aid, data.iid);
+                debug("[%s] Unregistered Characteristic \"%s\" on \"%s\" for events", connection.remoteAddress, characteristic.displayName, this.displayName);
             }
-            finally { if (e_16) throw e_16.error; }
+            // response is returned below in the else block
         }
-    };
-    Accessory.prototype.handleCharacteristicWrite = function (connection, data, writeState) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var characteristic, verifiable, notificationsEnabled, verifiable, allowWrite;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                characteristic = this.findCharacteristic(data.aid, data.iid);
-                if (!characteristic) {
-                    debug("[%s] Could not find a Characteristic with aid of %s and iid of %s", this.displayName, data.aid, data.iid);
-                    return [2 /*return*/, { status: -70410 /* HAPStatus.INVALID_VALUE_IN_REQUEST */ }];
+        if (data.value != null) {
+            if (!characteristic.props.perms.includes("pw" /* Perms.PAIRED_WRITE */)) { // check if write is allowed for this characteristic
+                debug("[%s] Tried writing to Characteristic which does not allow writing (aid of %s and iid of %s)", this.displayName, data.aid, data.iid);
+                return { status: -70404 /* HAPStatus.READ_ONLY_CHARACTERISTIC */ };
+            }
+            if (characteristic.props.adminOnlyAccess && characteristic.props.adminOnlyAccess.includes(1 /* Access.WRITE */)) {
+                const verifiable = connection.username && this._accessoryInfo;
+                if (!verifiable) {
+                    debug("[%s] Could not verify admin permissions for Characteristic which requires admin permissions for write (aid of %s and iid of %s)", this.displayName, data.aid, data.iid);
                 }
-                if (writeState === 2 /* WriteRequestState.TIMED_WRITE_REJECTED */) {
-                    return [2 /*return*/, { status: -70410 /* HAPStatus.INVALID_VALUE_IN_REQUEST */ }];
+                if (!verifiable || !this._accessoryInfo.hasAdminPermissions(connection.username)) {
+                    return { status: -70401 /* HAPStatus.INSUFFICIENT_PRIVILEGES */ };
                 }
-                if (data.ev == null && data.value == null) {
-                    return [2 /*return*/, { status: -70410 /* HAPStatus.INVALID_VALUE_IN_REQUEST */ }];
+            }
+            if (characteristic.props.perms.includes("aa" /* Perms.ADDITIONAL_AUTHORIZATION */) && characteristic.additionalAuthorizationHandler) {
+                // if the characteristic "supports additional authorization" but doesn't define a handler for the check
+                // we conclude that the characteristic doesn't want to check the authData (currently) and just allows access for everybody
+                let allowWrite;
+                try {
+                    allowWrite = characteristic.additionalAuthorizationHandler(data.authData);
                 }
-                if (data.ev != null) { // register/unregister event notifications
-                    if (!characteristic.props.perms.includes("ev" /* Perms.NOTIFY */)) { // check if notify is allowed for this characteristic
-                        debug("[%s] Tried %s notifications for Characteristic which does not allow notify (aid of %s and iid of %s)", this.displayName, data.ev ? "enabling" : "disabling", data.aid, data.iid);
-                        return [2 /*return*/, { status: -70406 /* HAPStatus.NOTIFICATION_NOT_SUPPORTED */ }];
-                    }
-                    if (characteristic.props.adminOnlyAccess && characteristic.props.adminOnlyAccess.includes(2 /* Access.NOTIFY */)) {
-                        verifiable = connection.username && this._accessoryInfo;
-                        if (!verifiable) {
-                            debug("[%s] Could not verify admin permissions for Characteristic which requires admin permissions for notify (aid of %s and iid of %s)", this.displayName, data.aid, data.iid);
-                        }
-                        if (!verifiable || !this._accessoryInfo.hasAdminPermissions(connection.username)) {
-                            return [2 /*return*/, { status: -70401 /* HAPStatus.INSUFFICIENT_PRIVILEGES */ }];
-                        }
-                    }
-                    notificationsEnabled = connection.hasEventNotifications(data.aid, data.iid);
-                    if (data.ev && !notificationsEnabled) {
-                        connection.enableEventNotifications(data.aid, data.iid);
-                        characteristic.subscribe();
-                        debug("[%s] Registered Characteristic \"%s\" on \"%s\" for events", connection.remoteAddress, characteristic.displayName, this.displayName);
-                    }
-                    else if (!data.ev && notificationsEnabled) {
-                        characteristic.unsubscribe();
-                        connection.disableEventNotifications(data.aid, data.iid);
-                        debug("[%s] Unregistered Characteristic \"%s\" on \"%s\" for events", connection.remoteAddress, characteristic.displayName, this.displayName);
-                    }
-                    // response is returned below in the else block
+                catch (error) {
+                    console.warn("[" + this.displayName + "] Additional authorization handler has thrown an error when checking authData: " + error.stack);
+                    allowWrite = false;
                 }
-                if (data.value != null) {
-                    if (!characteristic.props.perms.includes("pw" /* Perms.PAIRED_WRITE */)) { // check if write is allowed for this characteristic
-                        debug("[%s] Tried writing to Characteristic which does not allow writing (aid of %s and iid of %s)", this.displayName, data.aid, data.iid);
-                        return [2 /*return*/, { status: -70404 /* HAPStatus.READ_ONLY_CHARACTERISTIC */ }];
-                    }
-                    if (characteristic.props.adminOnlyAccess && characteristic.props.adminOnlyAccess.includes(1 /* Access.WRITE */)) {
-                        verifiable = connection.username && this._accessoryInfo;
-                        if (!verifiable) {
-                            debug("[%s] Could not verify admin permissions for Characteristic which requires admin permissions for write (aid of %s and iid of %s)", this.displayName, data.aid, data.iid);
-                        }
-                        if (!verifiable || !this._accessoryInfo.hasAdminPermissions(connection.username)) {
-                            return [2 /*return*/, { status: -70401 /* HAPStatus.INSUFFICIENT_PRIVILEGES */ }];
-                        }
-                    }
-                    if (characteristic.props.perms.includes("aa" /* Perms.ADDITIONAL_AUTHORIZATION */) && characteristic.additionalAuthorizationHandler) {
-                        allowWrite = void 0;
-                        try {
-                            allowWrite = characteristic.additionalAuthorizationHandler(data.authData);
-                        }
-                        catch (error) {
-                            console.warn("[" + this.displayName + "] Additional authorization handler has thrown an error when checking authData: " + error.stack);
-                            allowWrite = false;
-                        }
-                        if (!allowWrite) {
-                            return [2 /*return*/, { status: -70411 /* HAPStatus.INSUFFICIENT_AUTHORIZATION */ }];
-                        }
-                    }
-                    if (characteristic.props.perms.includes("tw" /* Perms.TIMED_WRITE */) && writeState !== 1 /* WriteRequestState.TIMED_WRITE_AUTHENTICATED */) {
-                        debug("[%s] Tried writing to a timed write only Characteristic without properly preparing (iid of %s and aid of %s)", this.displayName, data.aid, data.iid);
-                        return [2 /*return*/, { status: -70410 /* HAPStatus.INVALID_VALUE_IN_REQUEST */ }];
-                    }
-                    return [2 /*return*/, characteristic.handleSetRequest(data.value, connection).then(function (value) {
-                            debug("[%s] Setting Characteristic \"%s\" to value %s", _this.displayName, characteristic.displayName, data.value);
-                            return {
-                                // if write response is requests and value is provided, return that
-                                value: data.r && value ? (0, request_util_1.formatOutgoingCharacteristicValue)(value, characteristic.props) : undefined,
-                                status: 0 /* HAPStatus.SUCCESS */,
-                            };
-                        }, function (status) {
-                            // @ts-expect-error: forceConsistentCasingInFileNames compiler option
-                            debug("[%s] Error setting Characteristic \"%s\" to value %s: ", _this.displayName, characteristic.displayName, data.value, HAPServer_1.HAPStatus[status]);
-                            return { status: status };
-                        })];
+                if (!allowWrite) {
+                    return { status: -70411 /* HAPStatus.INSUFFICIENT_AUTHORIZATION */ };
                 }
-                return [2 /*return*/, { status: 0 /* HAPStatus.SUCCESS */ }];
+            }
+            if (characteristic.props.perms.includes("tw" /* Perms.TIMED_WRITE */) && writeState !== 1 /* WriteRequestState.TIMED_WRITE_AUTHENTICATED */) {
+                debug("[%s] Tried writing to a timed write only Characteristic without properly preparing (iid of %s and aid of %s)", this.displayName, data.aid, data.iid);
+                return { status: -70410 /* HAPStatus.INVALID_VALUE_IN_REQUEST */ };
+            }
+            return characteristic.handleSetRequest(data.value, connection).then(value => {
+                debug("[%s] Setting Characteristic \"%s\" to value %s", this.displayName, characteristic.displayName, data.value);
+                return {
+                    // if write response is requests and value is provided, return that
+                    value: data.r && value ? (0, request_util_1.formatOutgoingCharacteristicValue)(value, characteristic.props) : undefined,
+                    status: 0 /* HAPStatus.SUCCESS */,
+                };
+            }, (status) => {
+                // @ts-expect-error: forceConsistentCasingInFileNames compiler option
+                debug("[%s] Error setting Characteristic \"%s\" to value %s: ", this.displayName, characteristic.displayName, data.value, HAPServer_1.HAPStatus[status]);
+                return { status: status };
             });
-        });
-    };
-    Accessory.prototype.handleResource = function (data, callback) {
-        var _a;
+        }
+        return { status: 0 /* HAPStatus.SUCCESS */ };
+    }
+    handleResource(data, callback) {
         if (data["resource-type"] === "image" /* ResourceRequestType.IMAGE */) {
-            var aid = data.aid; // aid is optionally supplied by HomeKit (for example when camera is bridged, multiple cams, etc)
-            var accessory = undefined;
-            var controller = undefined;
+            const aid = data.aid; // aid is optionally supplied by HomeKit (for example when camera is bridged, multiple cams, etc)
+            let accessory = undefined;
+            let controller = undefined;
             if (aid) {
                 accessory = this.getAccessoryByAID(aid);
                 if (accessory && accessory.activeCameraController) {
@@ -1654,44 +1339,30 @@ var Accessory = /** @class */ (function (_super) {
                 callback({ httpCode: 404 /* HAPHTTPCode.NOT_FOUND */, status: -70409 /* HAPStatus.RESOURCE_DOES_NOT_EXIST */ });
                 return;
             }
-            controller.handleSnapshotRequest(data["image-height"], data["image-width"], accessory === null || accessory === void 0 ? void 0 : accessory.displayName, data.reason)
-                .then(function (buffer) {
+            controller.handleSnapshotRequest(data["image-height"], data["image-width"], accessory?.displayName, data.reason)
+                .then(buffer => {
                 callback(undefined, buffer);
-            }, function (status) {
+            }, (status) => {
                 callback({ httpCode: 207 /* HAPHTTPCode.MULTI_STATUS */, status: status });
             });
             return;
         }
-        debug("[%s] received request for unsupported image type: " + data["resource-type"], (_a = this._accessoryInfo) === null || _a === void 0 ? void 0 : _a.username);
+        debug("[%s] received request for unsupported image type: " + data["resource-type"], this._accessoryInfo?.username);
         callback({ httpCode: 404 /* HAPHTTPCode.NOT_FOUND */, status: -70409 /* HAPStatus.RESOURCE_DOES_NOT_EXIST */ });
-    };
-    Accessory.prototype.handleHAPConnectionClosed = function (connection) {
-        var e_19, _a;
-        if (this.activeCameraController) {
-            this.activeCameraController.handleCloseConnection(connection.sessionID);
-        }
-        try {
-            for (var _b = tslib_1.__values(connection.getRegisteredEvents()), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var event = _c.value;
-                var ids = event.split(".");
-                var aid = parseInt(ids[0], 10);
-                var iid = parseInt(ids[1], 10);
-                var characteristic = this.findCharacteristic(aid, iid);
-                if (characteristic) {
-                    characteristic.unsubscribe();
-                }
-            }
-        }
-        catch (e_19_1) { e_19 = { error: e_19_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+    }
+    handleHAPConnectionClosed(connection) {
+        for (const event of connection.getRegisteredEvents()) {
+            const ids = event.split(".");
+            const aid = parseInt(ids[0], 10);
+            const iid = parseInt(ids[1], 10);
+            const characteristic = this.findCharacteristic(aid, iid);
+            if (characteristic) {
+                characteristic.unsubscribe();
             }
-            finally { if (e_19) throw e_19.error; }
         }
         connection.clearRegisteredEvents();
-    };
-    Accessory.prototype.handleServiceConfigurationChangeEvent = function (service) {
+    }
+    handleServiceConfigurationChangeEvent(service) {
         if (!service.isPrimaryService && service === this.primaryService) {
             // service changed form primary to non-primary service
             this.primaryService = undefined;
@@ -1709,10 +1380,10 @@ var Accessory = /** @class */ (function (_super) {
         else {
             this.enqueueConfigurationUpdate();
         }
-    };
-    Accessory.prototype.handleCharacteristicChangeEvent = function (accessory, service, change) {
+    }
+    handleCharacteristicChangeEvent(accessory, service, change) {
         if (this.bridged) { // forward this to our main accessory
-            this.emit("service-characteristic-change" /* AccessoryEventTypes.SERVICE_CHARACTERISTIC_CHANGE */, tslib_1.__assign(tslib_1.__assign({}, change), { service: service }));
+            this.emit("service-characteristic-change" /* AccessoryEventTypes.SERVICE_CHARACTERISTIC_CHANGE */, { ...change, service: service });
         }
         else {
             if (!this._server) {
@@ -1735,28 +1406,27 @@ var Accessory = /** @class */ (function (_super) {
                 // otherwise we ignore this change event (with the return below)
                 return;
             }
-            var uuid_2 = change.characteristic.UUID;
-            var immediateDelivery = uuid_2 === Characteristic_1.Characteristic.ButtonEvent.UUID || uuid_2 === Characteristic_1.Characteristic.ProgrammableSwitchEvent.UUID
-                || uuid_2 === Characteristic_1.Characteristic.MotionDetected.UUID || uuid_2 === Characteristic_1.Characteristic.ContactSensorState.UUID;
-            var value = (0, request_util_1.formatOutgoingCharacteristicValue)(change.newValue, change.characteristic.props);
+            const uuid = change.characteristic.UUID;
+            const immediateDelivery = uuid === Characteristic_1.Characteristic.ButtonEvent.UUID || uuid === Characteristic_1.Characteristic.ProgrammableSwitchEvent.UUID
+                || uuid === Characteristic_1.Characteristic.MotionDetected.UUID || uuid === Characteristic_1.Characteristic.ContactSensorState.UUID;
+            const value = (0, request_util_1.formatOutgoingCharacteristicValue)(change.newValue, change.characteristic.props);
             this._server.sendEventNotifications(accessory.aid, change.characteristic.iid, value, change.originator, immediateDelivery);
         }
-    };
-    Accessory.prototype.sendCharacteristicWarning = function (characteristic, type, message) {
+    }
+    sendCharacteristicWarning(characteristic, type, message) {
         this.handleCharacteristicWarning({
             characteristic: characteristic,
             type: type,
             message: message,
-            originatorChain: [characteristic.displayName],
+            originatorChain: [characteristic.displayName], // we are missing the service displayName, but that's okay
             stack: new Error().stack,
         });
-    };
-    Accessory.prototype.handleCharacteristicWarning = function (warning) {
-        var _a;
-        warning.originatorChain = tslib_1.__spreadArray([this.displayName], tslib_1.__read(warning.originatorChain), false);
-        var emitted = this.emit("characteristic-warning" /* AccessoryEventTypes.CHARACTERISTIC_WARNING */, warning);
+    }
+    handleCharacteristicWarning(warning) {
+        warning.originatorChain = [this.displayName, ...warning.originatorChain];
+        const emitted = this.emit("characteristic-warning" /* AccessoryEventTypes.CHARACTERISTIC_WARNING */, warning);
         if (!emitted) {
-            var message = "[".concat(warning.originatorChain.join("@"), "] ").concat(warning.message);
+            const message = `[${warning.originatorChain.join("@")}] ${warning.message}`;
             if (warning.type === "error-message" /* CharacteristicWarningType.ERROR_MESSAGE */
                 || warning.type === "timeout-read" /* CharacteristicWarningType.TIMEOUT_READ */ || warning.type === "timeout-write" /* CharacteristicWarningType.TIMEOUT_WRITE */) {
                 console.error(message);
@@ -1764,67 +1434,55 @@ var Accessory = /** @class */ (function (_super) {
             else {
                 console.warn(message);
             }
-            debug("[%s] Above characteristic warning was thrown at: %s", this.displayName, (_a = warning.stack) !== null && _a !== void 0 ? _a : "unknown");
+            debug("[%s] Above characteristic warning was thrown at: %s", this.displayName, warning.stack ?? "unknown");
         }
-    };
-    Accessory.prototype.setupServiceEventHandlers = function (service) {
+    }
+    setupServiceEventHandlers(service) {
         service.on("service-configurationChange" /* ServiceEventTypes.SERVICE_CONFIGURATION_CHANGE */, this.handleServiceConfigurationChangeEvent.bind(this, service));
         service.on("characteristic-change" /* ServiceEventTypes.CHARACTERISTIC_CHANGE */, this.handleCharacteristicChangeEvent.bind(this, this, service));
         service.on("characteristic-warning" /* ServiceEventTypes.CHARACTERISTIC_WARNING */, this.handleCharacteristicWarning.bind(this));
-    };
-    Accessory.prototype._sideloadServices = function (targetServices) {
-        var e_20, _a;
-        var _this = this;
-        try {
-            for (var targetServices_1 = tslib_1.__values(targetServices), targetServices_1_1 = targetServices_1.next(); !targetServices_1_1.done; targetServices_1_1 = targetServices_1.next()) {
-                var service = targetServices_1_1.value;
-                this.setupServiceEventHandlers(service);
-            }
-        }
-        catch (e_20_1) { e_20 = { error: e_20_1 }; }
-        finally {
-            try {
-                if (targetServices_1_1 && !targetServices_1_1.done && (_a = targetServices_1.return)) _a.call(targetServices_1);
-            }
-            finally { if (e_20) throw e_20.error; }
+    }
+    _sideloadServices(targetServices) {
+        for (const service of targetServices) {
+            this.setupServiceEventHandlers(service);
         }
         this.services = targetServices.slice();
         // Fix Identify
         this
             .getService(Service_1.Service.AccessoryInformation)
             .getCharacteristic(Characteristic_1.Characteristic.Identify)
-            .on("set" /* CharacteristicEventTypes.SET */, function (value, callback) {
+            .on("set" /* CharacteristicEventTypes.SET */, (value, callback) => {
             if (value) {
-                var paired = true;
-                _this.identificationRequest(paired, callback);
+                const paired = true;
+                this.identificationRequest(paired, callback);
             }
         });
-    };
-    Accessory._generateSetupID = function () {
-        var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-        var max = chars.length;
-        var setupID = "";
-        for (var i = 0; i < 4; i++) {
-            var index = Math.floor(Math.random() * max);
+    }
+    static _generateSetupID() {
+        const chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        const max = chars.length;
+        let setupID = "";
+        for (let i = 0; i < 4; i++) {
+            const index = Math.floor(Math.random() * max);
             setupID += chars.charAt(index);
         }
         return setupID;
-    };
+    }
     // serialization and deserialization functions, mainly designed for homebridge to create a json copy to store on disk
-    Accessory.serialize = function (accessory) {
-        var json = {
+    static serialize(accessory) {
+        const json = {
             displayName: accessory.displayName,
             UUID: accessory.UUID,
             lastKnownUsername: accessory._accessoryInfo ? accessory._accessoryInfo.username : undefined,
             category: accessory.category,
             services: [],
         };
-        var linkedServices = {};
-        var hasLinkedServices = false;
-        accessory.services.forEach(function (service) {
+        const linkedServices = {};
+        let hasLinkedServices = false;
+        accessory.services.forEach(service => {
             json.services.push(Service_1.Service.serialize(service));
-            var linkedServicesPresentation = [];
-            service.linkedServices.forEach(function (linkedService) {
+            const linkedServicesPresentation = [];
+            service.linkedServices.forEach(linkedService => {
                 linkedServicesPresentation.push(linkedService.getServiceId());
             });
             if (linkedServicesPresentation.length > 0) {
@@ -1835,17 +1493,16 @@ var Accessory = /** @class */ (function (_super) {
         if (hasLinkedServices) {
             json.linkedServices = linkedServices;
         }
-        var controllers = [];
+        const controllers = [];
         // save controllers
-        Object.values(accessory.controllers).forEach(function (context) {
+        Object.values(accessory.controllers).forEach((context) => {
             controllers.push({
                 type: context.controller.controllerId(),
                 services: Accessory.serializeServiceMap(context.serviceMap),
             });
         });
         // also save controller which didn't get initialized (could lead to service duplication if we throw that data away)
-        accessory.serializedControllers && Object.entries(accessory.serializedControllers).forEach(function (_a) {
-            var _b = tslib_1.__read(_a, 2), id = _b[0], serviceMap = _b[1];
+        accessory.serializedControllers && Object.entries(accessory.serializedControllers).forEach(([id, serviceMap]) => {
             controllers.push({
                 type: id,
                 services: Accessory.serializeServiceMap(serviceMap),
@@ -1855,89 +1512,72 @@ var Accessory = /** @class */ (function (_super) {
             json.controllers = controllers;
         }
         return json;
-    };
-    Accessory.deserialize = function (json) {
-        var e_21, _a;
-        var accessory = new Accessory(json.displayName, json.UUID);
+    }
+    static deserialize(json) {
+        const accessory = new Accessory(json.displayName, json.UUID);
         accessory.lastKnownUsername = json.lastKnownUsername;
         accessory.category = json.category;
-        var services = [];
-        var servicesMap = {};
-        json.services.forEach(function (serialized) {
-            var service = Service_1.Service.deserialize(serialized);
+        const services = [];
+        const servicesMap = {};
+        json.services.forEach(serialized => {
+            const service = Service_1.Service.deserialize(serialized);
             services.push(service);
             servicesMap[service.getServiceId()] = service;
         });
         if (json.linkedServices) {
-            var _loop_3 = function (serviceId, linkedServicesKeys) {
-                var primaryService = servicesMap[serviceId];
+            for (const [serviceId, linkedServicesKeys] of Object.entries(json.linkedServices)) {
+                const primaryService = servicesMap[serviceId];
                 if (!primaryService) {
-                    return "continue";
+                    continue;
                 }
-                linkedServicesKeys.forEach(function (linkedServiceKey) {
-                    var linkedService = servicesMap[linkedServiceKey];
+                linkedServicesKeys.forEach(linkedServiceKey => {
+                    const linkedService = servicesMap[linkedServiceKey];
                     if (linkedService) {
                         primaryService.addLinkedService(linkedService);
                     }
                 });
-            };
-            try {
-                for (var _b = tslib_1.__values(Object.entries(json.linkedServices)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var _d = tslib_1.__read(_c.value, 2), serviceId = _d[0], linkedServicesKeys = _d[1];
-                    _loop_3(serviceId, linkedServicesKeys);
-                }
-            }
-            catch (e_21_1) { e_21 = { error: e_21_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                }
-                finally { if (e_21) throw e_21.error; }
             }
         }
         if (json.controllers) { // just save it for later if it exists {@see configureController}
             accessory.serializedControllers = {};
-            json.controllers.forEach(function (serializedController) {
+            json.controllers.forEach(serializedController => {
                 accessory.serializedControllers[serializedController.type] = Accessory.deserializeServiceMap(serializedController.services, servicesMap);
             });
         }
         accessory._sideloadServices(services);
         return accessory;
-    };
-    Accessory.cleanupAccessoryData = function (username) {
+    }
+    static cleanupAccessoryData(username) {
         IdentifierCache_1.IdentifierCache.remove(username);
         AccessoryInfo_1.AccessoryInfo.remove(username);
         ControllerStorage_1.ControllerStorage.remove(username);
-    };
-    Accessory.serializeServiceMap = function (serviceMap) {
-        var serialized = {};
-        Object.entries(serviceMap).forEach(function (_a) {
-            var _b = tslib_1.__read(_a, 2), name = _b[0], service = _b[1];
+    }
+    static serializeServiceMap(serviceMap) {
+        const serialized = {};
+        Object.entries(serviceMap).forEach(([name, service]) => {
             if (!service) {
                 return;
             }
             serialized[name] = service.getServiceId();
         });
         return serialized;
-    };
-    Accessory.deserializeServiceMap = function (serializedServiceMap, servicesMap) {
-        var controllerServiceMap = {};
-        Object.entries(serializedServiceMap).forEach(function (_a) {
-            var _b = tslib_1.__read(_a, 2), name = _b[0], serviceId = _b[1];
-            var service = servicesMap[serviceId];
+    }
+    static deserializeServiceMap(serializedServiceMap, servicesMap) {
+        const controllerServiceMap = {};
+        Object.entries(serializedServiceMap).forEach(([name, serviceId]) => {
+            const service = servicesMap[serviceId];
             if (service) {
                 controllerServiceMap[name] = service;
             }
         });
         return controllerServiceMap;
-    };
-    Accessory.parseBindOption = function (info) {
-        var e_22, _a;
-        var advertiserAddress = undefined;
-        var disableIpv6 = undefined;
-        var serverAddress = undefined;
+    }
+    static parseBindOption(info) {
+        let advertiserAddress = undefined;
+        let disableIpv6 = undefined;
+        let serverAddress = undefined;
         if (info.bind) {
-            var entries = new Set(Array.isArray(info.bind) ? info.bind : [info.bind]);
+            const entries = new Set(Array.isArray(info.bind) ? info.bind : [info.bind]);
             if (entries.has("::")) {
                 serverAddress = "::";
                 entries.delete("::");
@@ -1955,8 +1595,8 @@ var Accessory = /** @class */ (function (_super) {
             }
             else if (entries.size === 1) {
                 advertiserAddress = Array.from(entries);
-                var entry = entries.values().next().value; // grab the first one
-                var version = net_1.default.isIP(entry); // check if ip address was specified or an interface name
+                const entry = entries.values().next().value; // grab the first one
+                const version = net_1.default.isIP(entry); // check if ip address was specified or an interface name
                 if (version) {
                     serverAddress = version === 4 ? "0.0.0.0" : "::"; // we currently bind to unspecified addresses so config-ui always has a connection via loopback
                 }
@@ -1966,23 +1606,13 @@ var Accessory = /** @class */ (function (_super) {
             }
             else if (entries.size > 1) {
                 advertiserAddress = Array.from(entries);
-                var bindUnspecifiedIpv6 = false; // we bind on "::" if there are interface names, or we detect ipv6 addresses
-                try {
-                    for (var entries_1 = tslib_1.__values(entries), entries_1_1 = entries_1.next(); !entries_1_1.done; entries_1_1 = entries_1.next()) {
-                        var entry = entries_1_1.value;
-                        var version = net_1.default.isIP(entry);
-                        if (version === 0 || version === 6) {
-                            bindUnspecifiedIpv6 = true;
-                            break;
-                        }
-                    }
-                }
-                catch (e_22_1) { e_22 = { error: e_22_1 }; }
-                finally {
-                    try {
-                        if (entries_1_1 && !entries_1_1.done && (_a = entries_1.return)) _a.call(entries_1);
+                let bindUnspecifiedIpv6 = false; // we bind on "::" if there are interface names, or we detect ipv6 addresses
+                for (const entry of entries) {
+                    const version = net_1.default.isIP(entry);
+                    if (version === 0 || version === 6) {
+                        bindUnspecifiedIpv6 = true;
+                        break;
                     }
-                    finally { if (e_22) throw e_22.error; }
                 }
                 if (bindUnspecifiedIpv6) {
                     serverAddress = "::";
@@ -1998,17 +1628,7 @@ var Accessory = /** @class */ (function (_super) {
             serviceDisableIpv6: disableIpv6,
             serverAddress: serverAddress,
         };
-    };
-    /**
-     * @deprecated Please use the Categories const enum above.
-     */
-    // @ts-expect-error: forceConsistentCasingInFileNames compiler option
-    Accessory.Categories = Categories;
-    /// Timeout in milliseconds until a characteristic warning is issue
-    Accessory.TIMEOUT_WARNING = 3000;
-    /// Timeout in milliseconds after `TIMEOUT_WARNING` until the operation on the characteristic is considered timed out.
-    Accessory.TIMEOUT_AFTER_WARNING = 6000;
-    return Accessory;
-}(events_1.EventEmitter));
+    }
+}
 exports.Accessory = Accessory;
 //# sourceMappingURL=Accessory.js.map