hap-nodejs 0.11.0-beta.9 → 0.11.0

package/dist/lib/Accessory.js

@@ -2,11 +2,11 @@
 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 = (0, tslib_1.__importDefault)(require("assert"));
-var crypto_1 = (0, tslib_1.__importDefault)(require("crypto"));
-var debug_1 = (0, tslib_1.__importDefault)(require("debug"));
+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 = (0, tslib_1.__importDefault)(require("net"));
+var net_1 = tslib_1.__importDefault(require("net"));
 var Advertiser_1 = require("./Advertiser");
 // noinspection JSDeprecatedSymbols
 var camera_1 = require("./camera");
@@ -19,12 +19,16 @@ 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 = (0, tslib_1.__importStar)(require("./util/uuid"));
+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;
-// Known category values. Category is a hint to iOS clients about what "type" of Accessory this represents, for UI only.
+/**
+ * Known category values. Category is a hint to iOS clients about what "type" of Accessory this represents, for UI only.
+ *
+ * @group Accessory
+ */
 var Categories;
 (function (Categories) {
     // noinspection JSUnusedGlobalSymbols
@@ -67,6 +71,9 @@ var Categories;
     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 = {}));
+/**
+ * @group Accessory
+ */
 var CharacteristicWarningType;
 (function (CharacteristicWarningType) {
     CharacteristicWarningType["SLOW_WRITE"] = "slow-write";
@@ -77,6 +84,9 @@ var CharacteristicWarningType;
     CharacteristicWarningType["ERROR_MESSAGE"] = "error-message";
     CharacteristicWarningType["DEBUG_MESSAGE"] = "debug-message";
 })(CharacteristicWarningType = exports.CharacteristicWarningType || (exports.CharacteristicWarningType = {}));
+/**
+ * @group Accessory
+ */
 var MDNSAdvertiser;
 (function (MDNSAdvertiser) {
     /**
@@ -106,6 +116,9 @@ var WriteRequestState;
     WriteRequestState[WriteRequestState["TIMED_WRITE_AUTHENTICATED"] = 1] = "TIMED_WRITE_AUTHENTICATED";
     WriteRequestState[WriteRequestState["TIMED_WRITE_REJECTED"] = 2] = "TIMED_WRITE_REJECTED";
 })(WriteRequestState || (WriteRequestState = {}));
+/**
+ * @group Accessory
+ */
 var AccessoryEventTypes;
 (function (AccessoryEventTypes) {
     /**
@@ -144,9 +157,11 @@ var AccessoryEventTypes;
  * are hosted by the Bridge. This UUID must be "stable" and unchanging, even when the server is restarted. This
  * is required so that the Bridge can provide consistent "Accessory IDs" (aid) and "Instance IDs" (iid) for all
  * Accessories, Services, and Characteristics for iOS clients to reference later.
+ *
+ * @group Accessory
  */
 var Accessory = /** @class */ (function (_super) {
-    (0, tslib_1.__extends)(Accessory, _super);
+    tslib_1.__extends(Accessory, _super);
     function Accessory(displayName, UUID) {
         var _this = _super.call(this) || this;
         _this.displayName = displayName;
@@ -157,7 +172,7 @@ var Accessory = /** @class */ (function (_super) {
         _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 /* OTHER */;
+        _this.category = 1 /* Categories.OTHER */;
         _this.services = [];
         _this.shouldPurgeUnusedIDs = true; // Purge unused ids by default
         /**
@@ -167,7 +182,13 @@ var Accessory = /** @class */ (function (_super) {
          */
         _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.
@@ -176,7 +197,7 @@ var Accessory = /** @class */ (function (_super) {
         _this.lastAccessoriesRequest = 0;
         /**
          * Returns the bridging accessory if this accessory is bridged.
-         * Otherwise returns itself.
+         * Otherwise, returns itself.
          *
          * @returns the primary accessory
          */
@@ -194,7 +215,7 @@ var Accessory = /** @class */ (function (_super) {
         // 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)
             .getCharacteristic(Characteristic_1.Characteristic.Identify)
-            .on("set" /* SET */, function (value, callback) {
+            .on("set" /* CharacteristicEventTypes.SET */, function (value, callback) {
             if (value) {
                 var paired = true;
                 _this.identificationRequest(paired, callback);
@@ -204,10 +225,10 @@ var Accessory = /** @class */ (function (_super) {
     }
     Accessory.prototype.identificationRequest = function (paired, callback) {
         debug("[%s] Identification request", this.displayName);
-        if (this.listeners("identify" /* IDENTIFY */).length > 0) {
+        if (this.listeners("identify" /* AccessoryEventTypes.IDENTIFY */).length > 0) {
             // allow implementors to identify this Accessory in whatever way is appropriate, and pass along
             // the standard callback for completion.
-            this.emit("identify" /* IDENTIFY */, paired, callback);
+            this.emit("identify" /* AccessoryEventTypes.IDENTIFY */, paired, callback);
         }
         else {
             debug("[%s] Identification request ignored; no listeners to 'identify' event", this.displayName);
@@ -228,7 +249,7 @@ var Accessory = /** @class */ (function (_super) {
             : serviceParam;
         try {
             // check for UUID+subtype conflict
-            for (var _b = (0, tslib_1.__values)(this.services), _c = _b.next(); !_c.done; _c = _b.next()) {
+            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.
@@ -264,7 +285,7 @@ var Accessory = /** @class */ (function (_super) {
             this.enqueueConfigurationUpdate();
         }
         else {
-            this.emit("service-configurationChange" /* SERVICE_CONFIGURATION_CHANGE */, { service: service });
+            this.emit("service-configurationChange" /* AccessoryEventTypes.SERVICE_CONFIGURATION_CHANGE */, { service: service });
         }
         this.setupServiceEventHandlers(service);
         return service;
@@ -287,7 +308,7 @@ var Accessory = /** @class */ (function (_super) {
                 this.enqueueConfigurationUpdate();
             }
             else {
-                this.emit("service-configurationChange" /* SERVICE_CONFIGURATION_CHANGE */, { service: service });
+                this.emit("service-configurationChange" /* AccessoryEventTypes.SERVICE_CONFIGURATION_CHANGE */, { service: service });
             }
             service.removeAllListeners();
         }
@@ -295,7 +316,7 @@ var Accessory = /** @class */ (function (_super) {
     Accessory.prototype.removeLinkedService = function (removed) {
         var e_2, _a;
         try {
-            for (var _b = (0, tslib_1.__values)(this.services), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = tslib_1.__values(this.services), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var service = _c.value;
                 service.removeLinkedService(removed);
             }
@@ -311,11 +332,10 @@ var Accessory = /** @class */ (function (_super) {
     Accessory.prototype.getService = function (name) {
         var e_3, _a;
         try {
-            for (var _b = (0, tslib_1.__values)(this.services), _c = _b.next(); !_c.done; _c = _b.next()) {
+            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;
-                    // @ts-expect-error: UUID property
                 }
                 else if (typeof name === "function" && ((service instanceof name) || (name.UUID === service.UUID))) {
                     return service;
@@ -334,11 +354,10 @@ var Accessory = /** @class */ (function (_super) {
     Accessory.prototype.getServiceById = function (uuid, subType) {
         var e_4, _a;
         try {
-            for (var _b = (0, tslib_1.__values)(this.services), _c = _b.next(); !_c.done; _c = _b.next()) {
+            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;
-                    // @ts-expect-error: UUID property
                 }
                 else if (typeof uuid === "function" && ((service instanceof uuid) || (uuid.UUID === service.UUID)) && service.subtype === subType) {
                     return service;
@@ -365,35 +384,25 @@ var Accessory = /** @class */ (function (_super) {
         debug("Reachability update is no longer being supported.");
     };
     Accessory.prototype.addBridgedAccessory = function (accessory, deferUpdate) {
-        var e_5, _a;
         var _this = this;
         if (deferUpdate === void 0) { deferUpdate = false; }
-        if (accessory._isBridge) {
-            throw new Error("Cannot Bridge another Bridge!");
+        if (accessory._isBridge || accessory === this) {
+            throw new Error("Illegal state: either trying to bridge a bridge or trying to bridge itself!");
         }
-        try {
-            // check for UUID conflict
-            for (var _b = (0, tslib_1.__values)(this.bridgedAccessories), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var existing = _c.value;
-                if (existing.UUID === accessory.UUID) {
-                    throw new Error("Cannot add a bridged Accessory with the same UUID as another bridged Accessory: " + existing.UUID);
-                }
-            }
+        if (accessory.initialized) {
+            throw new Error("Tried to bridge an accessory which was already published once!");
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_5) throw e_5.error; }
+        if (accessory.bridge != null) {
+            // this also prevents that we bridge the same accessory twice!
+            throw new Error("Tried to bridge " + accessory.displayName + " while it was already bridged by " + accessory.bridge.displayName);
         }
         if (this.bridgedAccessories.length >= MAX_ACCESSORIES) {
             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" /* SERVICE_CHARACTERISTIC_CHANGE */, function (change) { return _this.handleCharacteristicChangeEvent(accessory, change.service, change); });
-        accessory.on("service-configurationChange" /* SERVICE_CONFIGURATION_CHANGE */, this.enqueueConfigurationUpdate.bind(this));
-        accessory.on("characteristic-warning" /* CHARACTERISTIC_WARNING */, this.handleCharacteristicWarning.bind(this));
+        accessory.on("service-characteristic-change" /* AccessoryEventTypes.SERVICE_CHARACTERISTIC_CHANGE */, function (change) { return _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;
         accessory.bridge = this;
         this.bridgedAccessories.push(accessory);
@@ -404,53 +413,51 @@ var Accessory = /** @class */ (function (_super) {
         return accessory;
     };
     Accessory.prototype.addBridgedAccessories = function (accessories) {
-        var e_6, _a;
+        var e_5, _a;
         try {
-            for (var accessories_1 = (0, tslib_1.__values)(accessories), accessories_1_1 = accessories_1.next(); !accessories_1_1.done; accessories_1_1 = accessories_1.next()) {
+            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_6_1) { e_6 = { error: e_6_1 }; }
+        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_6) throw e_6.error; }
+            finally { if (e_5) throw e_5.error; }
         }
         this.enqueueConfigurationUpdate();
     };
     Accessory.prototype.removeBridgedAccessory = function (accessory, deferUpdate) {
-        if (accessory._isBridge) {
-            throw new Error("Cannot Bridge another Bridge!");
-        }
+        if (deferUpdate === void 0) { deferUpdate = false; }
         // check for UUID conflict
-        var foundMatchAccessory = this.bridgedAccessories.findIndex(function (existing) {
-            return existing.UUID === accessory.UUID;
-        });
-        if (foundMatchAccessory === -1) {
+        var accessoryIndex = this.bridgedAccessories.indexOf(accessory);
+        if (accessoryIndex === -1) {
             throw new Error("Cannot find the bridged Accessory to remove.");
         }
-        this.bridgedAccessories.splice(foundMatchAccessory, 1);
+        this.bridgedAccessories.splice(accessoryIndex, 1);
+        accessory.bridged = false;
+        accessory.bridge = undefined;
         accessory.removeAllListeners();
         if (!deferUpdate) {
             this.enqueueConfigurationUpdate();
         }
     };
     Accessory.prototype.removeBridgedAccessories = function (accessories) {
-        var e_7, _a;
+        var e_6, _a;
         try {
-            for (var accessories_2 = (0, tslib_1.__values)(accessories), accessories_2_1 = accessories_2.next(); !accessories_2_1.done; accessories_2_1 = accessories_2.next()) {
+            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_7_1) { e_7 = { error: e_7_1 }; }
+        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_7) throw e_7.error; }
+            finally { if (e_6) throw e_6.error; }
         }
         this.enqueueConfigurationUpdate();
     };
@@ -461,9 +468,9 @@ var Accessory = /** @class */ (function (_super) {
         this.enqueueConfigurationUpdate();
     };
     Accessory.prototype.getCharacteristicByIID = function (iid) {
-        var e_8, _a;
+        var e_7, _a;
         try {
-            for (var _b = (0, tslib_1.__values)(this.services), _c = _b.next(); !_c.done; _c = _b.next()) {
+            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) {
@@ -471,35 +478,19 @@ var Accessory = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_8) throw e_8.error; }
+            finally { if (e_7) throw e_7.error; }
         }
     };
     Accessory.prototype.getAccessoryByAID = function (aid) {
-        var e_9, _a;
-        if (aid === 1) {
+        if (this.aid === aid) {
             return this;
         }
-        try {
-            for (var _b = (0, tslib_1.__values)(this.bridgedAccessories), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var accessory = _c.value;
-                if (accessory.aid === aid) {
-                    return accessory;
-                }
-            }
-        }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_9) throw e_9.error; }
-        }
-        return undefined;
+        return this.bridgedAccessories.find(function (value) { return value.aid === aid; });
     };
     Accessory.prototype.findCharacteristic = function (aid, iid) {
         var accessory = this.getAccessoryByAID(aid);
@@ -525,8 +516,8 @@ var Accessory = /** @class */ (function (_super) {
      *     - CameraOperatingMode
      *     - CameraEventRecordingManagement
      *
-     * @param cameraSource {LegacyCameraSource}
-     * @deprecated please refer to the new {@see CameraController} API and {@link configureController}
+     * @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;
@@ -557,7 +548,7 @@ var Accessory = /** @class */ (function (_super) {
         return cameraController; // return the reference for the controller (maybe this could be useful?)
     };
     /**
-     * This method is used to setup a new Controller for this accessory. See {@see Controller} for a more detailed
+     * 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.
      *
      * The controller can be passed as an instance of the class or as a constructor (without any necessary parameters)
@@ -565,10 +556,10 @@ var Accessory = /** @class */ (function (_super) {
      * Only one Controller of a given {@link ControllerIdentifier} can be configured for a given Accessory.
      *
      * When called, it will be checked if there are any services and persistent data the Controller (for the given
-     * {@link ControllerIdentifier}) can be restored from. Otherwise the Controller will be created with new services.
+     * {@link ControllerIdentifier}) can be restored from. Otherwise, the Controller will be created with new services.
      *
      *
-     * @param controllerConstructor {Controller | ControllerConstructor}
+     * @param controllerConstructor - The Controller instance or constructor to the Controller with no required arguments.
      */
     Accessory.prototype.configureController = function (controllerConstructor) {
         var _this = this;
@@ -632,7 +623,7 @@ var Accessory = /** @class */ (function (_super) {
         if (storedController) {
             if (storedController.controller !== controller) {
                 throw new Error("[" + this.displayName + "] tried removing a controller with the id/type '" + id +
-                    "' though provided controller isn't the same which is registered!");
+                    "' though provided controller isn't the same instance that is registered!");
             }
             if ((0, controller_1.isSerializableController)(controller)) {
                 // this will reset the state change delegate before we call handleControllerRemoved()
@@ -657,9 +648,9 @@ var Accessory = /** @class */ (function (_super) {
         }
     };
     Accessory.prototype.handleAccessoryUnpairedForControllers = function () {
-        var e_10, _a;
+        var e_8, _a;
         try {
-            for (var _b = (0, tslib_1.__values)(Object.values(this.controllers)), _c = _b.next(); !_c.done; _c = _b.next()) {
+            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
@@ -670,12 +661,12 @@ var Accessory = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        catch (e_8_1) { e_8 = { error: e_8_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_8) throw e_8.error; }
         }
     };
     Accessory.prototype.handleUpdatedControllerServiceMap = function (originalServiceMap, updatedServiceMap) {
@@ -685,8 +676,8 @@ var Accessory = /** @class */ (function (_super) {
             var service = originalServiceMap[name];
             var 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
+                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);
@@ -709,17 +700,17 @@ var Accessory = /** @class */ (function (_super) {
         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 setupCode = this._accessoryInfo && parseInt(this._accessoryInfo.pincode.replace(/-/g, ""), 10);
-        var value_low = setupCode;
-        var value_high = this._accessoryInfo && this._accessoryInfo.category >> 1;
+        var value_low = parseInt(this._accessoryInfo.pincode.replace(/-/g, ""), 10);
+        var value_high = this._accessoryInfo.category >> 1;
         value_low |= 1 << 28; // Supports IP;
         buffer.writeUInt32BE(value_low, 4);
-        if (this._accessoryInfo && this._accessoryInfo.category & 1) {
+        if (this._accessoryInfo.category & 1) {
             buffer[4] = buffer[4] | 1 << 7;
         }
         buffer.writeUInt32BE(value_high, 0);
-        var encodedPayload = (buffer.readUInt32BE(4) + (buffer.readUInt32BE(0) * Math.pow(2, 32))).toString(36).toUpperCase();
+        var encodedPayload = (buffer.readUInt32BE(4) + (buffer.readUInt32BE(0) * 0x100000000)).toString(36).toUpperCase();
         if (encodedPayload.length !== 9) {
             for (var i = 0; i <= 9 - encodedPayload.length; i++) {
                 encodedPayload = "0" + encodedPayload;
@@ -769,9 +760,10 @@ var Accessory = /** @class */ (function (_super) {
     /**
      * 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_11, _a, e_12, _b;
+        var e_9, _a, e_10, _b;
         // 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) {
@@ -788,7 +780,7 @@ var Accessory = /** @class */ (function (_super) {
             this.aid = 1;
         }
         try {
-            for (var _c = (0, tslib_1.__values)(this.services), _d = _c.next(); !_d.done; _d = _c.next()) {
+            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);
@@ -798,26 +790,26 @@ var Accessory = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_11) throw e_11.error; }
+            finally { if (e_9) throw e_9.error; }
         }
         try {
             // now assign IDs for any Accessories we are bridging
-            for (var _e = (0, tslib_1.__values)(this.bridgedAccessories), _f = _e.next(); !_f.done; _f = _e.next()) {
+            for (var _e = tslib_1.__values(this.bridgedAccessories), _f = _e.next(); !_f.done; _f = _e.next()) {
                 var accessory = _f.value;
                 accessory._assignIDs(identifierCache);
             }
         }
-        catch (e_12_1) { e_12 = { error: e_12_1 }; }
+        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_12) throw e_12.error; }
+            finally { if (e_10) throw e_10.error; }
         }
         // expire any now-unused cache keys (for Accessories, Services, or Characteristics
         // that have been removed since the last call to assignIDs())
@@ -838,7 +830,7 @@ var Accessory = /** @class */ (function (_super) {
     };
     /**
      * Manually purge the unused ids if you like, comes handy
-     * when you have disabled auto purge so you can do it manually
+     * when you have disabled auto purge, so you can do it manually
      */
     Accessory.prototype.purgeUnusedIDs = function () {
         //Cache the state of the purge mechanism and set it to true
@@ -854,10 +846,10 @@ var Accessory = /** @class */ (function (_super) {
      */
     Accessory.prototype.toHAP = function (connection, contactGetHandlers) {
         if (contactGetHandlers === void 0) { contactGetHandlers = true; }
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var accessory, accessories, _a, _b, _c, _d;
             var _e;
-            return (0, tslib_1.__generator)(this, function (_f) {
+            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 + "'");
@@ -888,7 +880,7 @@ var Accessory = /** @class */ (function (_super) {
      * Returns a JSON representation of this accessory without characteristic values.
      */
     Accessory.prototype.internalHAPRepresentation = function (assignIds) {
-        var e_13, _a;
+        var e_11, _a;
         if (assignIds === void 0) { assignIds = true; }
         if (assignIds) {
             this._assignIDs(this._identifierCache); // make sure our aid/iid's are all assigned
@@ -902,17 +894,17 @@ var Accessory = /** @class */ (function (_super) {
         var accessories = [accessory];
         if (!this.bridged) {
             try {
-                for (var _b = (0, tslib_1.__values)(this.bridgedAccessories), _c = _b.next(); !_c.done; _c = _b.next()) {
+                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_13_1) { e_13 = { error: e_13_1 }; }
+            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_13) throw e_13.error; }
+                finally { if (e_11) throw e_11.error; }
             }
         }
         return accessories;
@@ -932,23 +924,26 @@ var Accessory = /** @class */ (function (_super) {
      *                                new Accessory.
      */
     Accessory.prototype.publish = function (info, allowInsecureRequest) {
-        var _a, _b;
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var service, config, parsed, selectedAdvertiser, _c, _d, _e;
+        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 (0, tslib_1.__generator)(this, function (_f) {
-                switch (_f.label) {
+            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" /* BONJOUR */ : "ciao" /* CIAO */;
+                            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" /* BONJOUR */) {
+                        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.");
                         }
@@ -960,8 +955,8 @@ var Accessory = /** @class */ (function (_super) {
                         if (this.lastKnownUsername && this.lastKnownUsername !== info.username) { // username changed since last publish
                             Accessory.cleanupAccessoryData(this.lastKnownUsername); // delete old Accessory data
                         }
-                        if (!this.initialized && ((_a = info.addIdentifyingMaterial) !== null && _a !== void 0 ? _a : true)) {
-                            // adding some identifying material to our displayName if its our first publish() call
+                        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();
@@ -987,20 +982,20 @@ var Accessory = /** @class */ (function (_super) {
                         // 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 /* OTHER */;
+                        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
+                        // 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 not 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 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;
@@ -1016,33 +1011,33 @@ var Accessory = /** @class */ (function (_super) {
                         this._accessoryInfo.checkForCurrentConfigurationNumberIncrement(config, true);
                         this.validateAccessory(true);
                         parsed = Accessory.parseBindOption(info);
-                        selectedAdvertiser = (_b = info.advertiser) !== null && _b !== void 0 ? _b : "bonjour-hap" /* BONJOUR */;
-                        _d = info.advertiser === "avahi" /* AVAHI */;
-                        if (!_d) return [3 /*break*/, 2];
+                        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:
-                        _d = !(_f.sent());
-                        _f.label = 2;
+                        _e = !(_g.sent());
+                        _g.label = 2;
                     case 2:
-                        _c = (_d);
-                        if (_c) return [3 /*break*/, 5];
-                        _e = info.advertiser === "resolved" /* RESOLVED */;
-                        if (!_e) return [3 /*break*/, 4];
+                        _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:
-                        _e = !(_f.sent());
-                        _f.label = 4;
+                        _f = !(_g.sent());
+                        _g.label = 4;
                     case 4:
-                        _c = (_e);
-                        _f.label = 5;
+                        _d = (_f);
+                        _g.label = 5;
                     case 5:
-                        if (_c) {
+                        if (_d) {
                             console.error("[".concat(this.displayName, "] The selected advertiser, \"").concat(info.advertiser, "\", isn't available on this platform. ") +
-                                "Reverting to \"".concat("bonjour-hap" /* BONJOUR */, "\""));
-                            selectedAdvertiser = "bonjour-hap" /* BONJOUR */;
+                                "Reverting to \"".concat("bonjour-hap" /* MDNSAdvertiser.BONJOUR */, "\""));
+                            selectedAdvertiser = "bonjour-hap" /* MDNSAdvertiser.BONJOUR */;
                         }
                         switch (selectedAdvertiser) {
-                            case "ciao" /* CIAO */:
+                            case "ciao" /* MDNSAdvertiser.CIAO */:
                                 this._advertiser = new Advertiser_1.CiaoAdvertiser(this._accessoryInfo, {
                                     interface: parsed.advertiserAddress,
                                 }, {
@@ -1050,23 +1045,23 @@ var Accessory = /** @class */ (function (_super) {
                                     disabledIpv6: parsed.serviceDisableIpv6,
                                 });
                                 break;
-                            case "bonjour-hap" /* BONJOUR */:
+                            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" /* AVAHI */:
+                            case "avahi" /* MDNSAdvertiser.AVAHI */:
                                 this._advertiser = new Advertiser_1.AvahiAdvertiser(this._accessoryInfo);
                                 break;
-                            case "resolved" /* RESOLVED */:
+                            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" /* UPDATED_NAME */, function (name) {
+                        this._advertiser.on("updated-name" /* AdvertiserEvent.UPDATED_NAME */, function (name) {
                             _this.displayName = name;
                             if (_this._accessoryInfo) {
                                 _this._accessoryInfo.displayName = name;
@@ -1079,17 +1074,17 @@ var Accessory = /** @class */ (function (_super) {
                         // 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" /* LISTENING */, this.onListening.bind(this));
-                        this._server.on("identify" /* IDENTIFY */, this.identificationRequest.bind(this, false));
-                        this._server.on("pair" /* PAIR */, this.handleInitialPairSetupFinished.bind(this));
-                        this._server.on("add-pairing" /* ADD_PAIRING */, this.handleAddPairing.bind(this));
-                        this._server.on("remove-pairing" /* REMOVE_PAIRING */, this.handleRemovePairing.bind(this));
-                        this._server.on("list-pairings" /* LIST_PAIRINGS */, this.handleListPairings.bind(this));
-                        this._server.on("accessories" /* ACCESSORIES */, this.handleAccessories.bind(this));
-                        this._server.on("get-characteristics" /* GET_CHARACTERISTICS */, this.handleGetCharacteristics.bind(this));
-                        this._server.on("set-characteristics" /* SET_CHARACTERISTICS */, this.handleSetCharacteristics.bind(this));
-                        this._server.on("connection-closed" /* CONNECTION_CLOSED */, this.handleHAPConnectionClosed.bind(this));
-                        this._server.on("request-resource" /* REQUEST_RESOURCE */, this.handleResource.bind(this));
+                        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*/];
@@ -1114,8 +1109,8 @@ var Accessory = /** @class */ (function (_super) {
         return promise;
     };
     Accessory.prototype.unpublish = function () {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            return (0, tslib_1.__generator)(this, function (_a) {
+        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) {
@@ -1154,8 +1149,8 @@ var Accessory = /** @class */ (function (_super) {
             }
         }, 1000);
         this.configurationChangeDebounceTimeout.unref();
-        // 1d 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
+        // 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) {
@@ -1164,32 +1159,32 @@ var Accessory = /** @class */ (function (_super) {
         // 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" /* ADVERTISED */); })
+            .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); });
-        this.emit("listening" /* LISTENING */, port, hostname);
+        this.emit("listening" /* AccessoryEventTypes.LISTENING */, port, hostname);
     };
     Accessory.prototype.handleInitialPairSetupFinished = function (username, publicKey, callback) {
         debug("[%s] Paired with client %s", this.displayName, username);
-        this._accessoryInfo && this._accessoryInfo.addPairedClient(username, publicKey, 1 /* ADMIN */);
+        this._accessoryInfo && this._accessoryInfo.addPairedClient(username, publicKey, 1 /* PermissionTypes.ADMIN */);
         this._accessoryInfo && this._accessoryInfo.save();
-        // update our advertisement so it can pick up on the paired status of AccessoryInfo
+        // update our advertisement, so it can pick up on the paired status of AccessoryInfo
         this._advertiser && this._advertiser.updateAdvertisement();
         callback();
-        this.emit("paired" /* PAIRED */);
+        this.emit("paired" /* AccessoryEventTypes.PAIRED */);
     };
     Accessory.prototype.handleAddPairing = function (connection, username, publicKey, permission, callback) {
         if (!this._accessoryInfo) {
-            callback(6 /* UNAVAILABLE */);
+            callback(6 /* TLVErrorCode.UNAVAILABLE */);
             return;
         }
         if (!this._accessoryInfo.hasAdminPermissions(connection.username)) {
-            callback(2 /* AUTHENTICATION */);
+            callback(2 /* TLVErrorCode.AUTHENTICATION */);
             return;
         }
         var existingKey = this._accessoryInfo.getClientPublicKey(username);
         if (existingKey) {
             if (existingKey.toString() !== publicKey.toString()) {
-                callback(1 /* UNKNOWN */);
+                callback(1 /* TLVErrorCode.UNKNOWN */);
                 return;
             }
             this._accessoryInfo.updatePermission(username, permission);
@@ -1202,13 +1197,13 @@ var Accessory = /** @class */ (function (_super) {
         callback(0);
     };
     Accessory.prototype.handleRemovePairing = function (connection, username, callback) {
-        var e_14, _a;
+        var e_12, _a;
         if (!this._accessoryInfo) {
-            callback(6 /* UNAVAILABLE */);
+            callback(6 /* TLVErrorCode.UNAVAILABLE */);
             return;
         }
         if (!this._accessoryInfo.hasAdminPermissions(connection.username)) {
-            callback(2 /* AUTHENTICATION */);
+            callback(2 /* TLVErrorCode.AUTHENTICATION */);
             return;
         }
         this._accessoryInfo.removePairedClient(connection, username);
@@ -1216,30 +1211,30 @@ var Accessory = /** @class */ (function (_super) {
         callback(0); // first of all ensure the pairing is removed before we advertise availability again
         if (!this._accessoryInfo.paired()) {
             this._advertiser && this._advertiser.updateAdvertisement();
-            this.emit("unpaired" /* UNPAIRED */);
+            this.emit("unpaired" /* AccessoryEventTypes.UNPAIRED */);
             this.handleAccessoryUnpairedForControllers();
             try {
-                for (var _b = (0, tslib_1.__values)(this.bridgedAccessories), _c = _b.next(); !_c.done; _c = _b.next()) {
+                for (var _b = tslib_1.__values(this.bridgedAccessories), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var accessory = _c.value;
                     accessory.handleAccessoryUnpairedForControllers();
                 }
             }
-            catch (e_14_1) { e_14 = { error: e_14_1 }; }
+            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_14) throw e_14.error; }
+                finally { if (e_12) throw e_12.error; }
             }
         }
     };
     Accessory.prototype.handleListPairings = function (connection, callback) {
         if (!this._accessoryInfo) {
-            callback(6 /* UNAVAILABLE */);
+            callback(6 /* TLVErrorCode.UNAVAILABLE */);
             return;
         }
         if (!this._accessoryInfo.hasAdminPermissions(connection.username)) {
-            callback(2 /* AUTHENTICATION */);
+            callback(2 /* TLVErrorCode.AUTHENTICATION */);
             return;
         }
         callback(0, this._accessoryInfo.listPairings());
@@ -1248,7 +1243,7 @@ var Accessory = /** @class */ (function (_super) {
         var _this = this;
         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 latest value if last /accessories was more than 5s ago
+        var contactGetHandlers = now - this.lastAccessoriesRequest > 5000; // we query the latest value if last /accessories was more than 5s ago
         this.lastAccessoriesRequest = now;
         this.toHAP(connection, contactGetHandlers).then(function (value) {
             callback(undefined, {
@@ -1256,86 +1251,86 @@ var Accessory = /** @class */ (function (_super) {
             });
         }, function (reason) {
             console.error("[" + _this.displayName + "] /accessories request error with: " + reason.stack);
-            callback({ httpCode: 500 /* INTERNAL_SERVER_ERROR */, status: -70402 /* SERVICE_COMMUNICATION_FAILURE */ });
+            callback({ httpCode: 500 /* HAPHTTPCode.INTERNAL_SERVER_ERROR */, status: -70402 /* HAPStatus.SERVICE_COMMUNICATION_FAILURE */ });
         });
     };
     Accessory.prototype.handleGetCharacteristics = function (connection, request, callback) {
-        var e_15, _a;
+        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; }));
         if (missingCharacteristics.size !== request.ids.length) {
             // if those sizes differ, we have duplicates and can't properly handle that
-            callback({ httpCode: 422 /* UNPROCESSABLE_ENTITY */, status: -70410 /* INVALID_VALUE_IN_REQUEST */ });
+            callback({ httpCode: 422 /* HAPHTTPCode.UNPROCESSABLE_ENTITY */, status: -70410 /* HAPStatus.INVALID_VALUE_IN_REQUEST */ });
             return;
         }
         var timeout = setTimeout(function () {
-            var e_16, _a;
+            var e_14, _a;
             try {
-                for (var missingCharacteristics_1 = (0, tslib_1.__values)(missingCharacteristics), missingCharacteristics_1_1 = missingCharacteristics_1.next(); !missingCharacteristics_1_1.done; missingCharacteristics_1_1 = missingCharacteristics_1.next()) {
+                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" /* SLOW_READ */, "The read handler for the characteristic '" +
+                    _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_16_1) { e_16 = { error: e_16_1 }; }
+            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_16) throw e_16.error; }
+                finally { if (e_14) throw e_14.error; }
             }
-            // after a total of 10s we do not longer wait for a request to appear and just return status code timeout
+            // 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_17, _a;
+                var e_15, _a;
                 timeout = undefined;
                 try {
-                    for (var missingCharacteristics_2 = (0, tslib_1.__values)(missingCharacteristics), missingCharacteristics_2_1 = missingCharacteristics_2.next(); !missingCharacteristics_2_1.done; missingCharacteristics_2_1 = missingCharacteristics_2.next()) {
+                    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" /* TIMEOUT_READ */, "The read handler for the characteristic '" +
+                        _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 /* OPERATION_TIMED_OUT */,
+                            status: -70408 /* HAPStatus.OPERATION_TIMED_OUT */,
                         });
                     }
                 }
-                catch (e_17_1) { e_17 = { error: e_17_1 }; }
+                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_17) throw e_17.error; }
+                    finally { if (e_15) throw e_15.error; }
                 }
                 missingCharacteristics.clear();
                 callback(undefined, response);
-            }, 6000);
+            }, Accessory.TIMEOUT_AFTER_WARNING);
             timeout.unref();
-        }, 3000);
+        }, 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 (0, tslib_1.__assign)({ aid: id.aid, iid: id.iid }, 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));
                 return {
                     aid: id.aid,
                     iid: id.iid,
-                    status: -70402 /* SERVICE_COMMUNICATION_FAILURE */,
+                    status: -70402 /* HAPStatus.SERVICE_COMMUNICATION_FAILURE */,
                 };
             }).then(function (value) {
                 if (!timeout) {
@@ -1354,41 +1349,40 @@ var Accessory = /** @class */ (function (_super) {
         };
         var this_1 = this;
         try {
-            for (var _b = (0, tslib_1.__values)(request.ids), _c = _b.next(); !_c.done; _c = _b.next()) {
+            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_15_1) { e_15 = { error: e_15_1 }; }
+        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_15) throw e_15.error; }
+            finally { if (e_13) throw e_13.error; }
         }
     };
     Accessory.prototype.handleCharacteristicRead = function (connection, id, request) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var characteristic, verifiable;
             var _this = this;
-            return (0, tslib_1.__generator)(this, function (_a) {
+            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 /* INVALID_VALUE_IN_REQUEST */ }];
+                    return [2 /*return*/, { status: -70410 /* HAPStatus.INVALID_VALUE_IN_REQUEST */ }];
                 }
-                if (!characteristic.props.perms.includes("pr" /* PAIRED_READ */)) { // check if read is allowed for this characteristic
+                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 /* WRITE_ONLY_CHARACTERISTIC */ }];
+                    return [2 /*return*/, { status: -70405 /* HAPStatus.WRITE_ONLY_CHARACTERISTIC */ }];
                 }
-                if (characteristic.props.adminOnlyAccess && characteristic.props.adminOnlyAccess.includes(0 /* READ */)) {
-                    verifiable = true;
-                    if (!connection.username || !this._accessoryInfo) {
-                        verifiable = false;
+                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 /* INSUFFICIENT_PRIVILEGES */ }];
+                        return [2 /*return*/, { status: -70401 /* HAPStatus.INSUFFICIENT_PRIVILEGES */ }];
                     }
                 }
                 return [2 /*return*/, characteristic.handleGetRequest(connection).then(function (value) {
@@ -1409,14 +1403,14 @@ var Accessory = /** @class */ (function (_super) {
                             data.perms = characteristic.props.perms;
                         }
                         if (request.includeType) {
-                            data.type = (0, uuid_1.toShortForm)(_this.UUID);
+                            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: forceConsistentCasingInFileNames compiler option
+                        // @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 };
                     })];
@@ -1424,20 +1418,20 @@ var Accessory = /** @class */ (function (_super) {
         });
     };
     Accessory.prototype.handleSetCharacteristics = function (connection, writeRequest, callback) {
-        var e_18, _a;
+        var e_16, _a;
         var _this = this;
         debug("[%s] Processing characteristic set: %s", this.displayName, JSON.stringify(writeRequest));
-        var writeState = 0 /* REGULAR_REQUEST */;
+        var writeState = 0 /* WriteRequestState.REGULAR_REQUEST */;
         if (writeRequest.pid !== undefined) { // check for timed writes
             if (connection.timedWritePid === writeRequest.pid) {
-                writeState = 1 /* TIMED_WRITE_AUTHENTICATED */;
+                writeState = 1 /* WriteRequestState.TIMED_WRITE_AUTHENTICATED */;
                 clearTimeout(connection.timedWriteTimeout);
                 connection.timedWritePid = undefined;
                 connection.timedWriteTimeout = undefined;
                 debug("[%s] Timed write request got acknowledged for pid %d", this.displayName, writeRequest.pid);
             }
             else {
-                writeState = 2 /* TIMED_WRITE_REJECTED */;
+                writeState = 2 /* WriteRequestState.TIMED_WRITE_REJECTED */;
                 debug("[%s] TTL for timed write request has probably expired for pid %d", this.displayName, writeRequest.pid);
             }
         }
@@ -1447,75 +1441,75 @@ var Accessory = /** @class */ (function (_super) {
             .map(function (characteristic) { return 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 /* UNPROCESSABLE_ENTITY */, status: -70410 /* INVALID_VALUE_IN_REQUEST */ });
+            callback({ httpCode: 422 /* HAPHTTPCode.UNPROCESSABLE_ENTITY */, status: -70410 /* HAPStatus.INVALID_VALUE_IN_REQUEST */ });
             return;
         }
         var timeout = setTimeout(function () {
-            var e_19, _a;
+            var e_17, _a;
             try {
-                for (var missingCharacteristics_3 = (0, tslib_1.__values)(missingCharacteristics), missingCharacteristics_3_1 = missingCharacteristics_3.next(); !missingCharacteristics_3_1.done; missingCharacteristics_3_1 = missingCharacteristics_3.next()) {
+                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" /* SLOW_WRITE */, "The write handler for the characteristic '" +
+                    _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_19_1) { e_19 = { error: e_19_1 }; }
+            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_19) throw e_19.error; }
+                finally { if (e_17) throw e_17.error; }
             }
-            // after a total of 10s we do not longer wait for a request to appear and just return status code timeout
+            // 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_20, _a;
+                var e_18, _a;
                 timeout = undefined;
                 try {
-                    for (var missingCharacteristics_4 = (0, tslib_1.__values)(missingCharacteristics), missingCharacteristics_4_1 = missingCharacteristics_4.next(); !missingCharacteristics_4_1.done; missingCharacteristics_4_1 = missingCharacteristics_4.next()) {
+                    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" /* TIMEOUT_WRITE */, "The write handler for the characteristic '" +
+                        _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 /* OPERATION_TIMED_OUT */,
+                            status: -70408 /* HAPStatus.OPERATION_TIMED_OUT */,
                         });
                     }
                 }
-                catch (e_20_1) { e_20 = { error: e_20_1 }; }
+                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_20) throw e_20.error; }
+                    finally { if (e_18) throw e_18.error; }
                 }
                 missingCharacteristics.clear();
                 callback(undefined, response);
-            }, 6000);
+            }, Accessory.TIMEOUT_AFTER_WARNING);
             timeout.unref();
-        }, 3000);
+        }, 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 (0, tslib_1.__assign)({ aid: data.aid, iid: data.iid }, 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));
                 return {
                     aid: data.aid,
                     iid: data.iid,
-                    status: -70402 /* SERVICE_COMMUNICATION_FAILURE */,
+                    status: -70402 /* HAPStatus.SERVICE_COMMUNICATION_FAILURE */,
                 };
             }).then(function (value) {
                 if (!timeout) {
@@ -1534,84 +1528,77 @@ var Accessory = /** @class */ (function (_super) {
         };
         var this_2 = this;
         try {
-            for (var _b = (0, tslib_1.__values)(writeRequest.characteristics), _c = _b.next(); !_c.done; _c = _b.next()) {
+            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_18_1) { e_18 = { error: e_18_1 }; }
+        catch (e_16_1) { e_16 = { error: e_16_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_18) throw e_18.error; }
+            finally { if (e_16) throw e_16.error; }
         }
     };
     Accessory.prototype.handleCharacteristicWrite = function (connection, data, writeState) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var characteristic, evResponse, notificationsEnabled, verifiable, verifiable, allowWrite;
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var characteristic, verifiable, notificationsEnabled, verifiable, allowWrite;
             var _this = this;
-            return (0, tslib_1.__generator)(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 characteristic = this.findCharacteristic(data.aid, data.iid);
-                evResponse = undefined;
                 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 /* INVALID_VALUE_IN_REQUEST */ }];
+                    return [2 /*return*/, { status: -70410 /* HAPStatus.INVALID_VALUE_IN_REQUEST */ }];
+                }
+                if (writeState === 2 /* WriteRequestState.TIMED_WRITE_REJECTED */) {
+                    return [2 /*return*/, { status: -70410 /* HAPStatus.INVALID_VALUE_IN_REQUEST */ }];
                 }
-                if (writeState === 2 /* TIMED_WRITE_REJECTED */) {
-                    return [2 /*return*/, { status: -70410 /* INVALID_VALUE_IN_REQUEST */ }];
+                if (data.ev == null && data.value == null) {
+                    return [2 /*return*/, { status: -70410 /* HAPStatus.INVALID_VALUE_IN_REQUEST */ }];
                 }
                 if (data.ev != null) { // register/unregister event notifications
-                    notificationsEnabled = connection.hasEventNotifications(data.aid, data.iid);
-                    // it seems like the Home App sends unregister requests for characteristics which don't have notify permissions
-                    // see https://github.com/homebridge/HAP-NodeJS/issues/868
-                    if (notificationsEnabled !== data.ev) {
-                        if (!characteristic.props.perms.includes("ev" /* 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 /* NOTIFICATION_NOT_SUPPORTED */ }];
-                        }
-                        if (characteristic.props.adminOnlyAccess && characteristic.props.adminOnlyAccess.includes(2 /* NOTIFY */)) {
-                            verifiable = true;
-                            if (!connection.username || !this._accessoryInfo) {
-                                verifiable = false;
-                                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 /* INSUFFICIENT_PRIVILEGES */ }];
-                            }
-                        }
-                        // we already checked that data.ev != notificationsEnabled, thus just do whatever the connection asks for
-                        if (data.ev) {
-                            connection.enableEventNotifications(data.aid, data.iid);
-                            characteristic.subscribe();
-                            evResponse = true;
-                            debug("[%s] Registered Characteristic \"%s\" on \"%s\" for events", connection.remoteAddress, characteristic.displayName, this.displayName);
+                    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);
                         }
-                        else {
-                            characteristic.unsubscribe();
-                            connection.disableEventNotifications(data.aid, data.iid);
-                            evResponse = false;
-                            debug("[%s] Unregistered Characteristic \"%s\" on \"%s\" for events", connection.remoteAddress, characteristic.displayName, this.displayName);
+                        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
                 }
                 if (data.value != null) {
-                    if (!characteristic.props.perms.includes("pw" /* PAIRED_WRITE */)) { // check if write is allowed for this characteristic
+                    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 /* READ_ONLY_CHARACTERISTIC */ }];
+                        return [2 /*return*/, { status: -70404 /* HAPStatus.READ_ONLY_CHARACTERISTIC */ }];
                     }
-                    if (characteristic.props.adminOnlyAccess && characteristic.props.adminOnlyAccess.includes(1 /* WRITE */)) {
-                        verifiable = true;
-                        if (!connection.username || !this._accessoryInfo) {
-                            verifiable = false;
+                    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 /* INSUFFICIENT_PRIVILEGES */ }];
+                            return [2 /*return*/, { status: -70401 /* HAPStatus.INSUFFICIENT_PRIVILEGES */ }];
                         }
                     }
-                    if (characteristic.props.perms.includes("aa" /* ADDITIONAL_AUTHORIZATION */) && characteristic.additionalAuthorizationHandler) {
+                    if (characteristic.props.perms.includes("aa" /* Perms.ADDITIONAL_AUTHORIZATION */) && characteristic.additionalAuthorizationHandler) {
                         allowWrite = void 0;
                         try {
                             allowWrite = characteristic.additionalAuthorizationHandler(data.authData);
@@ -1621,19 +1608,19 @@ var Accessory = /** @class */ (function (_super) {
                             allowWrite = false;
                         }
                         if (!allowWrite) {
-                            return [2 /*return*/, { status: -70411 /* INSUFFICIENT_AUTHORIZATION */ }];
+                            return [2 /*return*/, { status: -70411 /* HAPStatus.INSUFFICIENT_AUTHORIZATION */ }];
                         }
                     }
-                    if (characteristic.props.perms.includes("tw" /* TIMED_WRITE */) && writeState !== 1 /* TIMED_WRITE_AUTHENTICATED */) {
+                    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 /* INVALID_VALUE_IN_REQUEST */ }];
+                        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,
-                                ev: evResponse,
+                                status: 0 /* HAPStatus.SUCCESS */,
                             };
                         }, function (status) {
                             // @ts-expect-error: forceConsistentCasingInFileNames compiler option
@@ -1641,16 +1628,13 @@ var Accessory = /** @class */ (function (_super) {
                             return { status: status };
                         })];
                 }
-                else {
-                    return [2 /*return*/, { ev: evResponse }];
-                }
-                return [2 /*return*/];
+                return [2 /*return*/, { status: 0 /* HAPStatus.SUCCESS */ }];
             });
         });
     };
     Accessory.prototype.handleResource = function (data, callback) {
         var _a;
-        if (data["resource-type"] === "image" /* IMAGE */) {
+        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;
@@ -1667,27 +1651,27 @@ var Accessory = /** @class */ (function (_super) {
             }
             if (!controller) {
                 debug("[%s] received snapshot request though no camera controller was associated!");
-                callback({ httpCode: 404 /* NOT_FOUND */, status: -70409 /* RESOURCE_DOES_NOT_EXIST */ });
+                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) {
                 callback(undefined, buffer);
             }, function (status) {
-                callback({ httpCode: 207 /* MULTI_STATUS */, 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);
-        callback({ httpCode: 404 /* NOT_FOUND */, status: -70409 /* RESOURCE_DOES_NOT_EXIST */ });
+        callback({ httpCode: 404 /* HAPHTTPCode.NOT_FOUND */, status: -70409 /* HAPStatus.RESOURCE_DOES_NOT_EXIST */ });
     };
     Accessory.prototype.handleHAPConnectionClosed = function (connection) {
-        var e_21, _a;
+        var e_19, _a;
         if (this.activeCameraController) {
             this.activeCameraController.handleCloseConnection(connection.sessionID);
         }
         try {
-            for (var _b = (0, tslib_1.__values)(connection.getRegisteredEvents()), _c = _b.next(); !_c.done; _c = _b.next()) {
+            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);
@@ -1698,29 +1682,29 @@ var Accessory = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_21_1) { e_21 = { error: e_21_1 }; }
+        catch (e_19_1) { e_19 = { error: e_19_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_21) throw e_21.error; }
+            finally { if (e_19) throw e_19.error; }
         }
         connection.clearRegisteredEvents();
     };
     Accessory.prototype.handleServiceConfigurationChangeEvent = function (service) {
         if (!service.isPrimaryService && service === this.primaryService) {
-            // service changed form primary to non primary service
+            // service changed form primary to non-primary service
             this.primaryService = undefined;
         }
         else if (service.isPrimaryService && service !== this.primaryService) {
-            // service changed from non primary to primary service
+            // service changed from non-primary to primary service
             if (this.primaryService !== undefined) {
                 this.primaryService.isPrimaryService = false;
             }
             this.primaryService = service;
         }
         if (this.bridged) {
-            this.emit("service-configurationChange" /* SERVICE_CONFIGURATION_CHANGE */, { service: service });
+            this.emit("service-configurationChange" /* AccessoryEventTypes.SERVICE_CONFIGURATION_CHANGE */, { service: service });
         }
         else {
             this.enqueueConfigurationUpdate();
@@ -1728,7 +1712,7 @@ var Accessory = /** @class */ (function (_super) {
     };
     Accessory.prototype.handleCharacteristicChangeEvent = function (accessory, service, change) {
         if (this.bridged) { // forward this to our main accessory
-            this.emit("service-characteristic-change" /* SERVICE_CHARACTERISTIC_CHANGE */, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, change), { service: service }));
+            this.emit("service-characteristic-change" /* AccessoryEventTypes.SERVICE_CHARACTERISTIC_CHANGE */, tslib_1.__assign(tslib_1.__assign({}, change), { service: service }));
         }
         else {
             if (!this._server) {
@@ -1742,7 +1726,7 @@ var Accessory = /** @class */ (function (_super) {
                 debug("[%s] Omitting event updates for %s as specified in the context object!", accessory.displayName, change.characteristic.displayName);
                 return;
             }
-            if (!(change.reason === "event" /* EVENT */ || change.oldValue !== change.newValue
+            if (!(change.reason === "event" /* ChangeReason.EVENT */ || change.oldValue !== change.newValue
                 || change.characteristic.UUID === Characteristic_1.Characteristic.ProgrammableSwitchEvent.UUID // those specific checks are out of backwards compatibility
                 || change.characteristic.UUID === Characteristic_1.Characteristic.ButtonEvent.UUID // new characteristics should use sendEventNotification call
             )) {
@@ -1769,12 +1753,12 @@ var Accessory = /** @class */ (function (_super) {
     };
     Accessory.prototype.handleCharacteristicWarning = function (warning) {
         var _a;
-        warning.originatorChain = (0, tslib_1.__spreadArray)([this.displayName], (0, tslib_1.__read)(warning.originatorChain), false);
-        var emitted = this.emit("characteristic-warning" /* CHARACTERISTIC_WARNING */, warning);
+        warning.originatorChain = tslib_1.__spreadArray([this.displayName], tslib_1.__read(warning.originatorChain), false);
+        var emitted = this.emit("characteristic-warning" /* AccessoryEventTypes.CHARACTERISTIC_WARNING */, warning);
         if (!emitted) {
             var message = "[".concat(warning.originatorChain.join("@"), "] ").concat(warning.message);
-            if (warning.type === "error-message" /* ERROR_MESSAGE */
-                || warning.type === "timeout-read" /* TIMEOUT_READ */ || warning.type === "timeout-write" /* TIMEOUT_WRITE */) {
+            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);
             }
             else {
@@ -1784,32 +1768,32 @@ var Accessory = /** @class */ (function (_super) {
         }
     };
     Accessory.prototype.setupServiceEventHandlers = function (service) {
-        service.on("service-configurationChange" /* SERVICE_CONFIGURATION_CHANGE */, this.handleServiceConfigurationChangeEvent.bind(this, service));
-        service.on("characteristic-change" /* CHARACTERISTIC_CHANGE */, this.handleCharacteristicChangeEvent.bind(this, this, service));
-        service.on("characteristic-warning" /* CHARACTERISTIC_WARNING */, this.handleCharacteristicWarning.bind(this));
+        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_22, _a;
+        var e_20, _a;
         var _this = this;
         try {
-            for (var targetServices_1 = (0, tslib_1.__values)(targetServices), targetServices_1_1 = targetServices_1.next(); !targetServices_1_1.done; targetServices_1_1 = targetServices_1.next()) {
+            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_22_1) { e_22 = { error: e_22_1 }; }
+        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_22) throw e_22.error; }
+            finally { if (e_20) throw e_20.error; }
         }
         this.services = targetServices.slice();
         // Fix Identify
         this
             .getService(Service_1.Service.AccessoryInformation)
             .getCharacteristic(Characteristic_1.Characteristic.Identify)
-            .on("set" /* SET */, function (value, callback) {
+            .on("set" /* CharacteristicEventTypes.SET */, function (value, callback) {
             if (value) {
                 var paired = true;
                 _this.identificationRequest(paired, callback);
@@ -1861,7 +1845,7 @@ var Accessory = /** @class */ (function (_super) {
         });
         // 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 = (0, tslib_1.__read)(_a, 2), id = _b[0], serviceMap = _b[1];
+            var _b = tslib_1.__read(_a, 2), id = _b[0], serviceMap = _b[1];
             controllers.push({
                 type: id,
                 services: Accessory.serializeServiceMap(serviceMap),
@@ -1873,7 +1857,7 @@ var Accessory = /** @class */ (function (_super) {
         return json;
     };
     Accessory.deserialize = function (json) {
-        var e_23, _a;
+        var e_21, _a;
         var accessory = new Accessory(json.displayName, json.UUID);
         accessory.lastKnownUsername = json.lastKnownUsername;
         accessory.category = json.category;
@@ -1898,17 +1882,17 @@ var Accessory = /** @class */ (function (_super) {
                 });
             };
             try {
-                for (var _b = (0, tslib_1.__values)(Object.entries(json.linkedServices)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var _d = (0, tslib_1.__read)(_c.value, 2), serviceId = _d[0], linkedServicesKeys = _d[1];
+                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_23_1) { e_23 = { error: e_23_1 }; }
+            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_23) throw e_23.error; }
+                finally { if (e_21) throw e_21.error; }
             }
         }
         if (json.controllers) { // just save it for later if it exists {@see configureController}
@@ -1928,7 +1912,7 @@ var Accessory = /** @class */ (function (_super) {
     Accessory.serializeServiceMap = function (serviceMap) {
         var serialized = {};
         Object.entries(serviceMap).forEach(function (_a) {
-            var _b = (0, tslib_1.__read)(_a, 2), name = _b[0], service = _b[1];
+            var _b = tslib_1.__read(_a, 2), name = _b[0], service = _b[1];
             if (!service) {
                 return;
             }
@@ -1939,7 +1923,7 @@ var Accessory = /** @class */ (function (_super) {
     Accessory.deserializeServiceMap = function (serializedServiceMap, servicesMap) {
         var controllerServiceMap = {};
         Object.entries(serializedServiceMap).forEach(function (_a) {
-            var _b = (0, tslib_1.__read)(_a, 2), name = _b[0], serviceId = _b[1];
+            var _b = tslib_1.__read(_a, 2), name = _b[0], serviceId = _b[1];
             var service = servicesMap[serviceId];
             if (service) {
                 controllerServiceMap[name] = service;
@@ -1948,9 +1932,9 @@ var Accessory = /** @class */ (function (_super) {
         return controllerServiceMap;
     };
     Accessory.parseBindOption = function (info) {
-        var e_24, _a;
+        var e_22, _a;
         var advertiserAddress = undefined;
-        var disableIpv6 = false;
+        var disableIpv6 = undefined;
         var serverAddress = undefined;
         if (info.bind) {
             var entries = new Set(Array.isArray(info.bind) ? info.bind : [info.bind]);
@@ -1972,7 +1956,7 @@ 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 a interface name
+                var 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
                 }
@@ -1984,7 +1968,7 @@ var Accessory = /** @class */ (function (_super) {
                 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 = (0, tslib_1.__values)(entries), entries_1_1 = entries_1.next(); !entries_1_1.done; entries_1_1 = entries_1.next()) {
+                    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) {
@@ -1993,12 +1977,12 @@ var Accessory = /** @class */ (function (_super) {
                         }
                     }
                 }
-                catch (e_24_1) { e_24 = { error: e_24_1 }; }
+                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);
                     }
-                    finally { if (e_24) throw e_24.error; }
+                    finally { if (e_22) throw e_22.error; }
                 }
                 if (bindUnspecifiedIpv6) {
                     serverAddress = "::";
@@ -2020,6 +2004,10 @@ var Accessory = /** @class */ (function (_super) {
      */
     // @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;