hap-nodejs 0.11.0-beta.11 → 0.11.0-beta.13

package/dist/lib/Accessory.js

@@ -176,7 +176,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
          */
@@ -365,27 +365,17 @@ 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");
@@ -404,53 +394,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()) {
                 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()) {
                 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,7 +449,7 @@ 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()) {
                 var service = _c.value;
@@ -471,35 +459,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);
@@ -557,7 +529,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 {@see 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,7 +537,7 @@ 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}
@@ -632,7 +604,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,7 +629,7 @@ 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()) {
                 var context = _c.value;
@@ -670,12 +642,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 +657,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 +681,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;
@@ -771,7 +743,7 @@ var Accessory = /** @class */ (function (_super) {
      * the provided identifierCache to keep IDs stable.
      */
     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) {
@@ -798,12 +770,12 @@ 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
@@ -812,12 +784,12 @@ var Accessory = /** @class */ (function (_super) {
                 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 +810,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
@@ -888,7 +860,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
@@ -907,12 +879,12 @@ var Accessory = /** @class */ (function (_super) {
                     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,13 +904,16 @@ var Accessory = /** @class */ (function (_super) {
      *                                new Accessory.
      */
     Accessory.prototype.publish = function (info, allowInsecureRequest) {
-        var _a, _b;
+        var _a, _b, _c;
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var service, config, parsed, selectedAdvertiser, _c, _d, _e;
+            var service, config, parsed, selectedAdvertiser, _d, _e, _f;
             var _this = this;
-            return (0, tslib_1.__generator)(this, function (_f) {
-                switch (_f.label) {
+            return (0, 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
@@ -960,8 +935,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();
@@ -990,17 +965,17 @@ var Accessory = /** @class */ (function (_super) {
                         this._accessoryInfo.category = info.category || 1 /* 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,27 +991,27 @@ 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" /* BONJOUR */;
+                        _e = info.advertiser === "avahi" /* 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" /* 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 */;
@@ -1154,8 +1129,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) {
@@ -1172,7 +1147,7 @@ var Accessory = /** @class */ (function (_super) {
         debug("[%s] Paired with client %s", this.displayName, username);
         this._accessoryInfo && this._accessoryInfo.addPairedClient(username, publicKey, 1 /* 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 */);
@@ -1202,7 +1177,7 @@ 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 */);
             return;
@@ -1224,12 +1199,12 @@ var Accessory = /** @class */ (function (_super) {
                     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; }
             }
         }
     };
@@ -1248,7 +1223,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, {
@@ -1260,7 +1235,7 @@ var Accessory = /** @class */ (function (_super) {
         });
     };
     Accessory.prototype.handleGetCharacteristics = function (connection, request, callback) {
-        var e_15, _a;
+        var e_13, _a;
         var _this = this;
         var characteristics = [];
         var response = { characteristics: characteristics };
@@ -1271,7 +1246,7 @@ var Accessory = /** @class */ (function (_super) {
             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()) {
                     var id = missingCharacteristics_1_1.value;
@@ -1284,16 +1259,16 @@ var Accessory = /** @class */ (function (_super) {
                         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()) {
@@ -1313,18 +1288,18 @@ var Accessory = /** @class */ (function (_super) {
                         });
                     }
                 }
-                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;
@@ -1359,12 +1334,12 @@ var Accessory = /** @class */ (function (_super) {
                 _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) {
@@ -1382,9 +1357,8 @@ var Accessory = /** @class */ (function (_super) {
                     return [2 /*return*/, { status: -70405 /* WRITE_ONLY_CHARACTERISTIC */ }];
                 }
                 if (characteristic.props.adminOnlyAccess && characteristic.props.adminOnlyAccess.includes(0 /* READ */)) {
-                    verifiable = true;
-                    if (!connection.username || !this._accessoryInfo) {
-                        verifiable = false;
+                    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)) {
@@ -1409,14 +1383,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,7 +1398,7 @@ 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 */;
@@ -1451,7 +1425,7 @@ var Accessory = /** @class */ (function (_super) {
             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()) {
                     var id = missingCharacteristics_3_1.value;
@@ -1464,16 +1438,16 @@ var Accessory = /** @class */ (function (_super) {
                         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()) {
@@ -1493,18 +1467,18 @@ var Accessory = /** @class */ (function (_super) {
                         });
                     }
                 }
-                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;
@@ -1539,21 +1513,20 @@ var Accessory = /** @class */ (function (_super) {
                 _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;
+            var characteristic, verifiable, notificationsEnabled, verifiable, allowWrite;
             var _this = this;
             return (0, 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 */ }];
@@ -1561,39 +1534,34 @@ var Accessory = /** @class */ (function (_super) {
                 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 /* 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" /* 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 = 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 /* 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) {
@@ -1602,9 +1570,8 @@ var Accessory = /** @class */ (function (_super) {
                         return [2 /*return*/, { status: -70404 /* READ_ONLY_CHARACTERISTIC */ }];
                     }
                     if (characteristic.props.adminOnlyAccess && characteristic.props.adminOnlyAccess.includes(1 /* WRITE */)) {
-                        verifiable = true;
-                        if (!connection.username || !this._accessoryInfo) {
-                            verifiable = false;
+                        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)) {
@@ -1633,7 +1600,7 @@ var Accessory = /** @class */ (function (_super) {
                             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 /* SUCCESS */,
                             };
                         }, function (status) {
                             // @ts-expect-error: forceConsistentCasingInFileNames compiler option
@@ -1641,10 +1608,7 @@ var Accessory = /** @class */ (function (_super) {
                             return { status: status };
                         })];
                 }
-                else {
-                    return [2 /*return*/, { ev: evResponse }];
-                }
-                return [2 /*return*/];
+                return [2 /*return*/, { status: 0 /* SUCCESS */ }];
             });
         });
     };
@@ -1682,7 +1646,7 @@ var Accessory = /** @class */ (function (_super) {
         callback({ httpCode: 404 /* NOT_FOUND */, status: -70409 /* 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);
         }
@@ -1698,22 +1662,22 @@ 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;
             }
@@ -1789,7 +1753,7 @@ var Accessory = /** @class */ (function (_super) {
         service.on("characteristic-warning" /* 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()) {
@@ -1797,12 +1761,12 @@ var Accessory = /** @class */ (function (_super) {
                 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
@@ -1873,7 +1837,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;
@@ -1903,12 +1867,12 @@ var Accessory = /** @class */ (function (_super) {
                     _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}
@@ -1948,9 +1912,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 +1936,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
                 }
@@ -1993,12 +1957,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 +1984,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;