hap-nodejs 1.0.0-beta.7 → 1.0.0

package/dist/lib/Service.js

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Service = exports.ServiceEventTypes = void 0;
-var tslib_1 = require("tslib");
-var assert_1 = tslib_1.__importDefault(require("assert"));
-var debug_1 = tslib_1.__importDefault(require("debug"));
-var events_1 = require("events");
-var Characteristic_1 = require("./Characteristic");
-var uuid_1 = require("./util/uuid");
-var debug = (0, debug_1.default)("HAP-NodeJS:Service");
+const tslib_1 = require("tslib");
+const assert_1 = tslib_1.__importDefault(require("assert"));
+const debug_1 = tslib_1.__importDefault(require("debug"));
+const events_1 = require("events");
+const Characteristic_1 = require("./Characteristic");
+const uuid_1 = require("./util/uuid");
+const checkName_1 = require("./util/checkName");
+const debug = (0, debug_1.default)("HAP-NodeJS:Service");
 /**
  * HAP spec allows a maximum of 100 characteristics per service!
  */
-var MAX_CHARACTERISTICS = 100;
+const MAX_CHARACTERISTICS = 100;
 /**
  * @group Service
  */
@@ -20,7 +21,7 @@ var ServiceEventTypes;
     ServiceEventTypes["CHARACTERISTIC_CHANGE"] = "characteristic-change";
     ServiceEventTypes["SERVICE_CONFIGURATION_CHANGE"] = "service-configurationChange";
     ServiceEventTypes["CHARACTERISTIC_WARNING"] = "characteristic-warning";
-})(ServiceEventTypes = exports.ServiceEventTypes || (exports.ServiceEventTypes = {}));
+})(ServiceEventTypes || (exports.ServiceEventTypes = ServiceEventTypes = {}));
 /**
  * Service represents a set of grouped values necessary to provide a logical function. For instance, a
  * "Door Lock Mechanism" service might contain two values, one for the "desired lock state" and one for the
@@ -43,41 +44,340 @@ var ServiceEventTypes;
  *
  * @group Service
  */
-var Service = /** @class */ (function (_super) {
-    tslib_1.__extends(Service, _super);
-    function Service(displayName, UUID, subtype) {
-        if (displayName === void 0) { displayName = ""; }
-        var _this = _super.call(this) || this;
-        _this.iid = null; // assigned later by our containing Accessory
-        _this.name = null;
-        _this.characteristics = [];
-        _this.optionalCharacteristics = [];
-        /**
-         * @private
-         */
-        _this.isHiddenService = false;
-        /**
-         * @private
-         */
-        _this.isPrimaryService = false; // do not write to this directly
-        /**
-         * @private
-         */
-        _this.linkedServices = [];
+// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
+class Service extends events_1.EventEmitter {
+    // Service MUST NOT have any other static variables
+    // Pattern below is for automatic detection of the section of defined services. Used by the generator
+    // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+    /**
+     * @group Service Definitions
+     */
+    static AccessCode;
+    /**
+     * @group Service Definitions
+     */
+    static AccessControl;
+    /**
+     * @group Service Definitions
+     */
+    static AccessoryInformation;
+    /**
+     * @group Service Definitions
+     */
+    static AccessoryMetrics;
+    /**
+     * @group Service Definitions
+     */
+    static AccessoryRuntimeInformation;
+    /**
+     * @group Service Definitions
+     */
+    static AirPurifier;
+    /**
+     * @group Service Definitions
+     */
+    static AirQualitySensor;
+    /**
+     * @group Service Definitions
+     */
+    static AssetUpdate;
+    /**
+     * @group Service Definitions
+     */
+    static Assistant;
+    /**
+     * @group Service Definitions
+     */
+    static AudioStreamManagement;
+    /**
+     * @group Service Definitions
+     */
+    static Battery;
+    /**
+     * @group Service Definitions
+     */
+    static CameraOperatingMode;
+    /**
+     * @group Service Definitions
+     */
+    static CameraRecordingManagement;
+    /**
+     * @group Service Definitions
+     */
+    static CameraRTPStreamManagement;
+    /**
+     * @group Service Definitions
+     */
+    static CarbonDioxideSensor;
+    /**
+     * @group Service Definitions
+     */
+    static CarbonMonoxideSensor;
+    /**
+     * @group Service Definitions
+     */
+    static CloudRelay;
+    /**
+     * @group Service Definitions
+     */
+    static ContactSensor;
+    /**
+     * @group Service Definitions
+     */
+    static DataStreamTransportManagement;
+    /**
+     * @group Service Definitions
+     */
+    static Diagnostics;
+    /**
+     * @group Service Definitions
+     */
+    static Door;
+    /**
+     * @group Service Definitions
+     */
+    static Doorbell;
+    /**
+     * @group Service Definitions
+     */
+    static Fan;
+    /**
+     * @group Service Definitions
+     */
+    static Fanv2;
+    /**
+     * @group Service Definitions
+     */
+    static Faucet;
+    /**
+     * @group Service Definitions
+     */
+    static FilterMaintenance;
+    /**
+     * @group Service Definitions
+     */
+    static FirmwareUpdate;
+    /**
+     * @group Service Definitions
+     */
+    static GarageDoorOpener;
+    /**
+     * @group Service Definitions
+     */
+    static HeaterCooler;
+    /**
+     * @group Service Definitions
+     */
+    static HumidifierDehumidifier;
+    /**
+     * @group Service Definitions
+     */
+    static HumiditySensor;
+    /**
+     * @group Service Definitions
+     */
+    static InputSource;
+    /**
+     * @group Service Definitions
+     */
+    static IrrigationSystem;
+    /**
+     * @group Service Definitions
+     */
+    static LeakSensor;
+    /**
+     * @group Service Definitions
+     */
+    static Lightbulb;
+    /**
+     * @group Service Definitions
+     */
+    static LightSensor;
+    /**
+     * @group Service Definitions
+     */
+    static LockManagement;
+    /**
+     * @group Service Definitions
+     */
+    static LockMechanism;
+    /**
+     * @group Service Definitions
+     */
+    static Microphone;
+    /**
+     * @group Service Definitions
+     */
+    static MotionSensor;
+    /**
+     * @group Service Definitions
+     */
+    static NFCAccess;
+    /**
+     * @group Service Definitions
+     */
+    static OccupancySensor;
+    /**
+     * @group Service Definitions
+     */
+    static Outlet;
+    /**
+     * @group Service Definitions
+     */
+    static Pairing;
+    /**
+     * @group Service Definitions
+     */
+    static PowerManagement;
+    /**
+     * @group Service Definitions
+     */
+    static ProtocolInformation;
+    /**
+     * @group Service Definitions
+     */
+    static SecuritySystem;
+    /**
+     * @group Service Definitions
+     */
+    static ServiceLabel;
+    /**
+     * @group Service Definitions
+     */
+    static Siri;
+    /**
+     * @group Service Definitions
+     */
+    static SiriEndpoint;
+    /**
+     * @group Service Definitions
+     */
+    static Slats;
+    /**
+     * @group Service Definitions
+     */
+    static SmartSpeaker;
+    /**
+     * @group Service Definitions
+     */
+    static SmokeSensor;
+    /**
+     * @group Service Definitions
+     */
+    static Speaker;
+    /**
+     * @group Service Definitions
+     */
+    static StatefulProgrammableSwitch;
+    /**
+     * @group Service Definitions
+     */
+    static StatelessProgrammableSwitch;
+    /**
+     * @group Service Definitions
+     */
+    static Switch;
+    /**
+     * @group Service Definitions
+     */
+    static TapManagement;
+    /**
+     * @group Service Definitions
+     */
+    static TargetControl;
+    /**
+     * @group Service Definitions
+     */
+    static TargetControlManagement;
+    /**
+     * @group Service Definitions
+     */
+    static Television;
+    /**
+     * @group Service Definitions
+     */
+    static TelevisionSpeaker;
+    /**
+     * @group Service Definitions
+     */
+    static TemperatureSensor;
+    /**
+     * @group Service Definitions
+     */
+    static Thermostat;
+    /**
+     * @group Service Definitions
+     */
+    static ThreadTransport;
+    /**
+     * @group Service Definitions
+     */
+    static TransferTransportManagement;
+    /**
+     * @group Service Definitions
+     */
+    static Tunnel;
+    /**
+     * @group Service Definitions
+     */
+    static Valve;
+    /**
+     * @group Service Definitions
+     */
+    static WiFiRouter;
+    /**
+     * @group Service Definitions
+     */
+    static WiFiSatellite;
+    /**
+     * @group Service Definitions
+     */
+    static WiFiTransport;
+    /**
+     * @group Service Definitions
+     */
+    static Window;
+    /**
+     * @group Service Definitions
+     */
+    static WindowCovering;
+    // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+    // NOTICE: when adding/changing properties, remember to possibly adjust the serialize/deserialize functions
+    displayName;
+    UUID;
+    subtype;
+    iid = null; // assigned later by our containing Accessory
+    name = null;
+    characteristics = [];
+    optionalCharacteristics = [];
+    /**
+     * @private
+     */
+    isHiddenService = false;
+    /**
+     * @private
+     */
+    isPrimaryService = false; // do not write to this directly
+    /**
+     * @private
+     */
+    linkedServices = [];
+    constructor(displayName = "", UUID, subtype) {
+        super();
         (0, assert_1.default)(UUID, "Services must be created with a valid UUID.");
-        _this.displayName = displayName;
-        _this.UUID = UUID;
-        _this.subtype = subtype;
+        this.displayName = displayName;
+        this.UUID = UUID;
+        this.subtype = subtype;
         // every service has an optional Characteristic.Name property - we'll set it to our displayName
         // if one was given
         // if you don't provide a display name, some HomeKit apps may choose to hide the device.
         if (displayName) {
             // create the characteristic if necessary
-            var nameCharacteristic = _this.getCharacteristic(Characteristic_1.Characteristic.Name) ||
-                _this.addCharacteristic(Characteristic_1.Characteristic.Name);
+            (0, checkName_1.checkName)(this.displayName, "Name", displayName);
+            const nameCharacteristic = this.getCharacteristic(Characteristic_1.Characteristic.Name) ||
+                this.addCharacteristic(Characteristic_1.Characteristic.Name);
             nameCharacteristic.updateValue(displayName);
         }
-        return _this;
     }
     /**
      * Returns an id which uniquely identifies a service on the associated accessory.
@@ -86,38 +386,23 @@ var Service = /** @class */ (function (_super) {
      *
      * @returns the serviceId
      */
-    Service.prototype.getServiceId = function () {
+    getServiceId() {
         return this.UUID + (this.subtype || "");
-    };
+    }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    Service.prototype.addCharacteristic = function (input) {
+    addCharacteristic(input, ...constructorArgs) {
         // characteristic might be a constructor like `Characteristic.Brightness` instead of an instance of Characteristic. Coerce if necessary.
-        var e_1, _a;
-        var constructorArgs = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            constructorArgs[_i - 1] = arguments[_i];
-        }
-        var characteristic = typeof input === "function" ? new (input.bind.apply(input, tslib_1.__spreadArray([void 0], tslib_1.__read(constructorArgs), false)))() : input;
-        try {
-            // check for UUID conflict
-            for (var _b = tslib_1.__values(this.characteristics), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var existing = _c.value;
-                if (existing.UUID === characteristic.UUID) {
-                    if (characteristic.UUID === "00000052-0000-1000-8000-0026BB765291") {
-                        //This is a special workaround for the Firmware Revision characteristic.
-                        return existing;
-                    }
-                    throw new Error("Cannot add a Characteristic with the same UUID as another Characteristic in this Service: " + existing.UUID);
+        const characteristic = typeof input === "function" ? new input(...constructorArgs) : input;
+        // check for UUID conflict
+        for (const existing of this.characteristics) {
+            if (existing.UUID === characteristic.UUID) {
+                if (characteristic.UUID === "00000052-0000-1000-8000-0026BB765291") {
+                    //This is a special workaround for the Firmware Revision characteristic.
+                    return existing;
                 }
+                throw new Error("Cannot add a Characteristic with the same UUID as another Characteristic in this Service: " + existing.UUID);
             }
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
         if (this.characteristics.length >= MAX_CHARACTERISTICS) {
             throw new Error("Cannot add more than " + MAX_CHARACTERISTICS + " characteristics to a single service!");
         }
@@ -125,7 +410,7 @@ var Service = /** @class */ (function (_super) {
         this.characteristics.push(characteristic);
         this.emit("service-configurationChange" /* ServiceEventTypes.SERVICE_CONFIGURATION_CHANGE */);
         return characteristic;
-    };
+    }
     /**
      * Sets this service as the new primary service.
      * Any currently active primary service will be reset to be not primary.
@@ -134,142 +419,115 @@ var Service = /** @class */ (function (_super) {
      *
      * @param isPrimary - optional boolean (default true) if the service should be the primary service
      */
-    Service.prototype.setPrimaryService = function (isPrimary) {
-        if (isPrimary === void 0) { isPrimary = true; }
+    setPrimaryService(isPrimary = true) {
         this.isPrimaryService = isPrimary;
         this.emit("service-configurationChange" /* ServiceEventTypes.SERVICE_CONFIGURATION_CHANGE */);
-    };
+    }
     /**
      * Marks the service as hidden
      *
      * @param isHidden - optional boolean (default true) if the service should be marked hidden
      */
-    Service.prototype.setHiddenService = function (isHidden) {
-        if (isHidden === void 0) { isHidden = true; }
+    setHiddenService(isHidden = true) {
         this.isHiddenService = isHidden;
         this.emit("service-configurationChange" /* ServiceEventTypes.SERVICE_CONFIGURATION_CHANGE */);
-    };
+    }
     /**
      * Adds a new link to the specified service. The service MUST be already added to
      * the SAME accessory.
      *
      * @param service - The service this service should link to
      */
-    Service.prototype.addLinkedService = function (service) {
+    addLinkedService(service) {
         //TODO: Add a check if the service is on the same accessory.
         if (!this.linkedServices.includes(service)) {
             this.linkedServices.push(service);
         }
         this.emit("service-configurationChange" /* ServiceEventTypes.SERVICE_CONFIGURATION_CHANGE */);
-    };
+    }
     /**
      * Removes a link to the specified service which was previously added with {@link addLinkedService}
      *
      * @param service - Previously linked service
      */
-    Service.prototype.removeLinkedService = function (service) {
+    removeLinkedService(service) {
         //TODO: Add a check if the service is on the same accessory.
-        var index = this.linkedServices.indexOf(service);
+        const index = this.linkedServices.indexOf(service);
         if (index !== -1) {
             this.linkedServices.splice(index, 1);
         }
         this.emit("service-configurationChange" /* ServiceEventTypes.SERVICE_CONFIGURATION_CHANGE */);
-    };
-    Service.prototype.removeCharacteristic = function (characteristic) {
-        var index = this.characteristics.indexOf(characteristic);
+    }
+    removeCharacteristic(characteristic) {
+        const index = this.characteristics.indexOf(characteristic);
         if (index !== -1) {
             this.characteristics.splice(index, 1);
             characteristic.removeAllListeners();
             this.emit("service-configurationChange" /* ServiceEventTypes.SERVICE_CONFIGURATION_CHANGE */);
         }
-    };
-    Service.prototype.getCharacteristic = function (name) {
+    }
+    getCharacteristic(name) {
         // returns a characteristic object from the service
         // If  Service.prototype.getCharacteristic(Characteristic.Type)  does not find the characteristic,
         // but the type is in optionalCharacteristics, it adds the characteristic.type to the service and returns it.
-        var e_2, _a, e_3, _b;
-        try {
-            for (var _c = tslib_1.__values(this.characteristics), _d = _c.next(); !_d.done; _d = _c.next()) {
-                var characteristic = _d.value;
-                if (typeof name === "string" && characteristic.displayName === name) {
-                    return characteristic;
-                }
-                else if (typeof name === "function" && ((characteristic instanceof name) || (name.UUID === characteristic.UUID))) {
+        for (const characteristic of this.characteristics) {
+            if (typeof name === "string" && characteristic.displayName === name) {
+                return characteristic;
+            }
+            else {
+                // @ts-expect-error ('UUID' does not exist on type 'never')
+                if (typeof name === "function" && ((characteristic instanceof name) || (name.UUID === characteristic.UUID))) {
                     return characteristic;
                 }
             }
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-        finally {
-            try {
-                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
-            }
-            finally { if (e_2) throw e_2.error; }
-        }
         if (typeof name === "function") {
-            try {
-                for (var _e = tslib_1.__values(this.optionalCharacteristics), _f = _e.next(); !_f.done; _f = _e.next()) {
-                    var characteristic = _f.value;
-                    if ((characteristic instanceof name) || (name.UUID === characteristic.UUID)) {
-                        return this.addCharacteristic(name);
-                    }
-                }
-            }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
-            finally {
-                try {
-                    if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
+            for (const characteristic of this.optionalCharacteristics) {
+                // @ts-expect-error ('UUID' does not exist on type 'never')
+                if ((characteristic instanceof name) || (name.UUID === characteristic.UUID)) {
+                    return this.addCharacteristic(name);
                 }
-                finally { if (e_3) throw e_3.error; }
             }
-            var instance = this.addCharacteristic(name);
+            const instance = this.addCharacteristic(name);
             // Not found in optional Characteristics. Adding anyway, but warning about it if it isn't the Name.
             if (name.UUID !== Characteristic_1.Characteristic.Name.UUID) {
                 this.emitCharacteristicWarningEvent(instance, "warn-message" /* CharacteristicWarningType.WARN_MESSAGE */, "Characteristic not in required or optional characteristic section for service " + this.constructor.name + ". Adding anyway.");
             }
             return instance;
         }
-    };
-    Service.prototype.testCharacteristic = function (name) {
-        var e_4, _a;
-        try {
-            // checks for the existence of a characteristic object in the service
-            for (var _b = tslib_1.__values(this.characteristics), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var characteristic = _c.value;
-                if (typeof name === "string" && characteristic.displayName === name) {
-                    return true;
-                }
-                else if (typeof name === "function" && ((characteristic instanceof name) || (name.UUID === characteristic.UUID))) {
+    }
+    testCharacteristic(name) {
+        // checks for the existence of a characteristic object in the service
+        for (const characteristic of this.characteristics) {
+            if (typeof name === "string" && characteristic.displayName === name) {
+                return true;
+            }
+            else {
+                // @ts-expect-error ('UUID' does not exist on type 'never')
+                if (typeof name === "function" && ((characteristic instanceof name) || (name.UUID === characteristic.UUID))) {
                     return true;
                 }
             }
         }
-        catch (e_4_1) { e_4 = { error: e_4_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_4) throw e_4.error; }
-        }
         return false;
-    };
-    Service.prototype.setCharacteristic = function (name, value) {
+    }
+    setCharacteristic(name, value) {
         // @ts-expect-error: We know that both overloads exists individually. There is just no publicly exposed type for that!
         this.getCharacteristic(name).setValue(value);
         return this; // for chaining
-    };
-    Service.prototype.updateCharacteristic = function (name, value) {
+    }
+    updateCharacteristic(name, value) {
         this.getCharacteristic(name).updateValue(value);
         return this;
-    };
-    Service.prototype.addOptionalCharacteristic = function (characteristic) {
+    }
+    addOptionalCharacteristic(characteristic) {
         // characteristic might be a constructor like `Characteristic.Brightness` instead of an instance
         // of Characteristic. Coerce if necessary.
         if (typeof characteristic === "function") {
             characteristic = new characteristic();
         }
         this.optionalCharacteristics.push(characteristic);
-    };
+    }
     // noinspection JSUnusedGlobalSymbols
     /**
      * This method was created to copy all characteristics from another service to this.
@@ -281,15 +539,14 @@ var Service = /** @class */ (function (_super) {
      * @param service
      * @private used by homebridge
      */
-    Service.prototype.replaceCharacteristicsFromService = function (service) {
-        var _this = this;
+    replaceCharacteristicsFromService(service) {
         if (this.UUID !== service.UUID) {
-            throw new Error("Incompatible services. Tried replacing characteristics of ".concat(this.UUID, " with characteristics from ").concat(service.UUID));
+            throw new Error(`Incompatible services. Tried replacing characteristics of ${this.UUID} with characteristics from ${service.UUID}`);
         }
-        var foreignCharacteristics = {}; // index foreign characteristics by UUID
-        service.characteristics.forEach(function (characteristic) { return foreignCharacteristics[characteristic.UUID] = characteristic; });
-        this.characteristics.forEach(function (characteristic) {
-            var foreignCharacteristic = foreignCharacteristics[characteristic.UUID];
+        const foreignCharacteristics = {}; // index foreign characteristics by UUID
+        service.characteristics.forEach(characteristic => foreignCharacteristics[characteristic.UUID] = characteristic);
+        this.characteristics.forEach(characteristic => {
+            const foreignCharacteristic = foreignCharacteristics[characteristic.UUID];
             if (foreignCharacteristic) {
                 delete foreignCharacteristics[characteristic.UUID];
                 if (!foreignCharacteristic.value && foreignCharacteristic.value !== 0 && foreignCharacteristic.value !== false) {
@@ -299,35 +556,22 @@ var Service = /** @class */ (function (_super) {
             }
         });
         // add all additional characteristics which where not present already
-        Object.values(foreignCharacteristics).forEach(function (characteristic) { return _this.addCharacteristic(characteristic); });
-    };
+        Object.values(foreignCharacteristics).forEach(characteristic => this.addCharacteristic(characteristic));
+    }
     /**
      * @private
      */
-    Service.prototype.getCharacteristicByIID = function (iid) {
-        var e_5, _a;
-        try {
-            for (var _b = tslib_1.__values(this.characteristics), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var characteristic = _c.value;
-                if (characteristic.iid === iid) {
-                    return characteristic;
-                }
-            }
-        }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+    getCharacteristicByIID(iid) {
+        for (const characteristic of this.characteristics) {
+            if (characteristic.iid === iid) {
+                return characteristic;
             }
-            finally { if (e_5) throw e_5.error; }
         }
-    };
+    }
     /**
      * @private
      */
-    Service.prototype._assignIDs = function (identifierCache, accessoryName, baseIID) {
-        var e_6, _a;
-        if (baseIID === void 0) { baseIID = 0; }
+    _assignIDs(identifierCache, accessoryName, baseIID = 0) {
         // the Accessory Information service must have a (reserved by IdentifierCache) ID of 1
         if (this.UUID === "0000003E-0000-1000-8000-0026BB765291") {
             this.iid = 1;
@@ -336,105 +580,60 @@ var Service = /** @class */ (function (_super) {
             // assign our own ID based on our UUID
             this.iid = baseIID + identifierCache.getIID(accessoryName, this.UUID, this.subtype);
         }
-        try {
-            // assign IIDs to our Characteristics
-            for (var _b = tslib_1.__values(this.characteristics), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var characteristic = _c.value;
-                characteristic._assignID(identifierCache, accessoryName, this.UUID, this.subtype);
-            }
-        }
-        catch (e_6_1) { e_6 = { error: e_6_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_6) throw e_6.error; }
+        // assign IIDs to our Characteristics
+        for (const characteristic of this.characteristics) {
+            characteristic._assignID(identifierCache, accessoryName, this.UUID, this.subtype);
         }
-    };
+    }
     /**
      * Returns a JSON representation of this service suitable for delivering to HAP clients.
      * @private used to generate response to /accessories query
      */
-    Service.prototype.toHAP = function (connection, contactGetHandlers) {
-        var _this = this;
-        if (contactGetHandlers === void 0) { contactGetHandlers = true; }
-        return new Promise(function (resolve) {
-            var e_7, _a, e_8, _b;
-            (0, assert_1.default)(_this.iid, "iid cannot be undefined for service '" + _this.displayName + "'");
-            (0, assert_1.default)(_this.characteristics.length, "service '" + _this.displayName + "' does not have any characteristics!");
-            var service = {
-                type: (0, uuid_1.toShortForm)(_this.UUID),
-                iid: _this.iid,
+    toHAP(connection, contactGetHandlers = true) {
+        return new Promise(resolve => {
+            (0, assert_1.default)(this.iid, "iid cannot be undefined for service '" + this.displayName + "'");
+            (0, assert_1.default)(this.characteristics.length, "service '" + this.displayName + "' does not have any characteristics!");
+            const service = {
+                type: (0, uuid_1.toShortForm)(this.UUID),
+                iid: this.iid,
                 characteristics: [],
-                hidden: _this.isHiddenService ? true : undefined,
-                primary: _this.isPrimaryService ? true : undefined,
+                hidden: this.isHiddenService ? true : undefined,
+                primary: this.isPrimaryService ? true : undefined,
             };
-            if (_this.linkedServices.length) {
+            if (this.linkedServices.length) {
                 service.linked = [];
-                try {
-                    for (var _c = tslib_1.__values(_this.linkedServices), _d = _c.next(); !_d.done; _d = _c.next()) {
-                        var linked = _d.value;
-                        if (!linked.iid) {
-                            // we got a linked service which is not added to the accessory
-                            // as it doesn't "exists" we just ignore it.
-                            // we have some (at least one) plugins on homebridge which link to the AccessoryInformation service.
-                            // homebridge always creates its own AccessoryInformation service and ignores the user supplied one
-                            // thus the link is automatically broken.
-                            debug("iid of linked service '".concat(linked.displayName, "' ").concat(linked.UUID, " is undefined on service '").concat(_this.displayName, "'"));
-                            continue;
-                        }
-                        service.linked.push(linked.iid);
-                    }
-                }
-                catch (e_7_1) { e_7 = { error: e_7_1 }; }
-                finally {
-                    try {
-                        if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                for (const linked of this.linkedServices) {
+                    if (!linked.iid) {
+                        // we got a linked service which is not added to the accessory
+                        // as it doesn't "exists" we just ignore it.
+                        // we have some (at least one) plugins on homebridge which link to the AccessoryInformation service.
+                        // homebridge always creates its own AccessoryInformation service and ignores the user supplied one
+                        // thus the link is automatically broken.
+                        debug(`iid of linked service '${linked.displayName}' ${linked.UUID} is undefined on service '${this.displayName}'`);
+                        continue;
                     }
-                    finally { if (e_7) throw e_7.error; }
+                    service.linked.push(linked.iid);
                 }
             }
-            var missingCharacteristics = new Set();
-            var timeout = setTimeout(function () {
-                var e_9, _a;
-                try {
-                    for (var missingCharacteristics_1 = tslib_1.__values(missingCharacteristics), missingCharacteristics_1_1 = missingCharacteristics_1.next(); !missingCharacteristics_1_1.done; missingCharacteristics_1_1 = missingCharacteristics_1.next()) {
-                        var characteristic = missingCharacteristics_1_1.value;
-                        _this.emitCharacteristicWarningEvent(characteristic, "slow-read" /* CharacteristicWarningType.SLOW_READ */, "The read handler for the characteristic '".concat(characteristic.displayName, "' was slow to respond!"));
-                    }
+            const missingCharacteristics = new Set();
+            let timeout = setTimeout(() => {
+                for (const characteristic of missingCharacteristics) {
+                    this.emitCharacteristicWarningEvent(characteristic, "slow-read" /* CharacteristicWarningType.SLOW_READ */, `The read handler for the characteristic '${characteristic.displayName}' was slow to respond!`);
                 }
-                catch (e_9_1) { e_9 = { error: e_9_1 }; }
-                finally {
-                    try {
-                        if (missingCharacteristics_1_1 && !missingCharacteristics_1_1.done && (_a = missingCharacteristics_1.return)) _a.call(missingCharacteristics_1);
-                    }
-                    finally { if (e_9) throw e_9.error; }
-                }
-                timeout = setTimeout(function () {
-                    var e_10, _a;
+                timeout = setTimeout(() => {
                     timeout = undefined;
-                    try {
-                        for (var missingCharacteristics_2 = tslib_1.__values(missingCharacteristics), missingCharacteristics_2_1 = missingCharacteristics_2.next(); !missingCharacteristics_2_1.done; missingCharacteristics_2_1 = missingCharacteristics_2.next()) {
-                            var characteristic = missingCharacteristics_2_1.value;
-                            _this.emitCharacteristicWarningEvent(characteristic, "timeout-read" /* CharacteristicWarningType.TIMEOUT_READ */, "The read handler for the characteristic '" + (characteristic === null || characteristic === void 0 ? void 0 : characteristic.displayName) +
-                                "' didn't respond at all!. Please check that you properly call the callback!");
-                            service.characteristics.push(characteristic.internalHAPRepresentation()); // value is set to null
-                        }
-                    }
-                    catch (e_10_1) { e_10 = { error: e_10_1 }; }
-                    finally {
-                        try {
-                            if (missingCharacteristics_2_1 && !missingCharacteristics_2_1.done && (_a = missingCharacteristics_2.return)) _a.call(missingCharacteristics_2);
-                        }
-                        finally { if (e_10) throw e_10.error; }
+                    for (const characteristic of missingCharacteristics) {
+                        this.emitCharacteristicWarningEvent(characteristic, "timeout-read" /* CharacteristicWarningType.TIMEOUT_READ */, "The read handler for the characteristic '" + characteristic?.displayName +
+                            "' didn't respond at all!. Please check that you properly call the callback!");
+                        service.characteristics.push(characteristic.internalHAPRepresentation()); // value is set to null
                     }
                     missingCharacteristics.clear();
                     resolve(service);
                 }, 6000);
             }, 3000);
-            var _loop_1 = function (characteristic) {
+            for (const characteristic of this.characteristics) {
                 missingCharacteristics.add(characteristic);
-                characteristic.toHAP(connection, contactGetHandlers).then(function (value) {
+                characteristic.toHAP(connection, contactGetHandlers).then(value => {
                     if (!timeout) {
                         return; // if timeout is undefined, response was already sent out
                     }
@@ -448,79 +647,54 @@ var Service = /** @class */ (function (_super) {
                         resolve(service);
                     }
                 });
-            };
-            try {
-                for (var _e = tslib_1.__values(_this.characteristics), _f = _e.next(); !_f.done; _f = _e.next()) {
-                    var characteristic = _f.value;
-                    _loop_1(characteristic);
-                }
-            }
-            catch (e_8_1) { e_8 = { error: e_8_1 }; }
-            finally {
-                try {
-                    if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
-                }
-                finally { if (e_8) throw e_8.error; }
             }
         });
-    };
+    }
     /**
      * Returns a JSON representation of this service without characteristic values.
      * @private used to generate the config hash
      */
-    Service.prototype.internalHAPRepresentation = function () {
-        var e_11, _a;
+    internalHAPRepresentation() {
         (0, assert_1.default)(this.iid, "iid cannot be undefined for service '" + this.displayName + "'");
         (0, assert_1.default)(this.characteristics.length, "service '" + this.displayName + "' does not have any characteristics!");
-        var service = {
+        const service = {
             type: (0, uuid_1.toShortForm)(this.UUID),
             iid: this.iid,
-            characteristics: this.characteristics.map(function (characteristic) { return characteristic.internalHAPRepresentation(); }),
+            characteristics: this.characteristics.map(characteristic => characteristic.internalHAPRepresentation()),
             hidden: this.isHiddenService ? true : undefined,
             primary: this.isPrimaryService ? true : undefined,
         };
         if (this.linkedServices.length) {
             service.linked = [];
-            try {
-                for (var _b = tslib_1.__values(this.linkedServices), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var linked = _c.value;
-                    if (!linked.iid) {
-                        // we got a linked service which is not added to the accessory
-                        // as it doesn't "exists" we just ignore it.
-                        // we have some (at least one) plugins on homebridge which link to the AccessoryInformation service.
-                        // homebridge always creates its own AccessoryInformation service and ignores the user supplied one
-                        // thus the link is automatically broken.
-                        debug("iid of linked service '".concat(linked.displayName, "' ").concat(linked.UUID, " is undefined on service '").concat(this.displayName, "'"));
-                        continue;
-                    }
-                    service.linked.push(linked.iid);
+            for (const linked of this.linkedServices) {
+                if (!linked.iid) {
+                    // we got a linked service which is not added to the accessory
+                    // as it doesn't "exists" we just ignore it.
+                    // we have some (at least one) plugins on homebridge which link to the AccessoryInformation service.
+                    // homebridge always creates its own AccessoryInformation service and ignores the user supplied one
+                    // thus the link is automatically broken.
+                    debug(`iid of linked service '${linked.displayName}' ${linked.UUID} is undefined on service '${this.displayName}'`);
+                    continue;
                 }
-            }
-            catch (e_11_1) { e_11 = { error: e_11_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                }
-                finally { if (e_11) throw e_11.error; }
+                service.linked.push(linked.iid);
             }
         }
         return service;
-    };
+    }
     /**
      * @private
      */
-    Service.prototype.setupCharacteristicEventHandlers = function (characteristic) {
-        var _this = this;
+    setupCharacteristicEventHandlers(characteristic) {
         // listen for changes in characteristics and bubble them up
-        characteristic.on("change" /* CharacteristicEventTypes.CHANGE */, function (change) {
-            _this.emit("characteristic-change" /* ServiceEventTypes.CHARACTERISTIC_CHANGE */, tslib_1.__assign(tslib_1.__assign({}, change), { characteristic: characteristic }));
+        characteristic.on("change" /* CharacteristicEventTypes.CHANGE */, (change) => {
+            this.emit("characteristic-change" /* ServiceEventTypes.CHARACTERISTIC_CHANGE */, { ...change, characteristic: characteristic });
         });
         characteristic.on("characteristic-warning" /* CharacteristicEventTypes.CHARACTERISTIC_WARNING */, this.emitCharacteristicWarningEvent.bind(this, characteristic));
-    };
+    }
     /**
      * @private
      */
-    Service.prototype.emitCharacteristicWarningEvent = function (characteristic, type, message, stack) {
+    emitCharacteristicWarningEvent(characteristic, type, message, stack) {
         this.emit("characteristic-warning" /* ServiceEventTypes.CHARACTERISTIC_WARNING */, {
             characteristic: characteristic,
             type: type,
@@ -528,32 +702,21 @@ var Service = /** @class */ (function (_super) {
             originatorChain: [this.displayName, characteristic.displayName],
             stack: stack,
         });
-    };
+    }
     /**
      * @private
      */
-    Service.prototype._sideloadCharacteristics = function (targetCharacteristics) {
-        var e_12, _a;
-        try {
-            for (var targetCharacteristics_1 = tslib_1.__values(targetCharacteristics), targetCharacteristics_1_1 = targetCharacteristics_1.next(); !targetCharacteristics_1_1.done; targetCharacteristics_1_1 = targetCharacteristics_1.next()) {
-                var target = targetCharacteristics_1_1.value;
-                this.setupCharacteristicEventHandlers(target);
-            }
-        }
-        catch (e_12_1) { e_12 = { error: e_12_1 }; }
-        finally {
-            try {
-                if (targetCharacteristics_1_1 && !targetCharacteristics_1_1.done && (_a = targetCharacteristics_1.return)) _a.call(targetCharacteristics_1);
-            }
-            finally { if (e_12) throw e_12.error; }
+    _sideloadCharacteristics(targetCharacteristics) {
+        for (const target of targetCharacteristics) {
+            this.setupCharacteristicEventHandlers(target);
         }
         this.characteristics = targetCharacteristics.slice();
-    };
+    }
     /**
      * @private
      */
-    Service.serialize = function (service) {
-        var constructorName;
+    static serialize(service) {
+        let constructorName;
         if (service.constructor.name !== "Service") {
             constructorName = service.constructor.name;
         }
@@ -564,18 +727,18 @@ var Service = /** @class */ (function (_super) {
             constructorName: constructorName,
             hiddenService: service.isHiddenService,
             primaryService: service.isPrimaryService,
-            characteristics: service.characteristics.map(function (characteristic) { return Characteristic_1.Characteristic.serialize(characteristic); }),
-            optionalCharacteristics: service.optionalCharacteristics.map(function (characteristic) { return Characteristic_1.Characteristic.serialize(characteristic); }),
+            characteristics: service.characteristics.map(characteristic => Characteristic_1.Characteristic.serialize(characteristic)),
+            optionalCharacteristics: service.optionalCharacteristics.map(characteristic => Characteristic_1.Characteristic.serialize(characteristic)),
         };
-    };
+    }
     /**
      * @private
      */
-    Service.deserialize = function (json) {
-        var service;
+    static deserialize(json) {
+        let service;
         if (json.constructorName && json.constructorName.charAt(0).toUpperCase() === json.constructorName.charAt(0)
             && Service[json.constructorName]) { // MUST start with uppercase character and must exist on Service object
-            var constructor = Service[json.constructorName];
+            const constructor = Service[json.constructorName];
             service = new constructor(json.displayName, json.subtype);
         }
         else {
@@ -583,15 +746,14 @@ var Service = /** @class */ (function (_super) {
         }
         service.isHiddenService = !!json.hiddenService;
         service.isPrimaryService = !!json.primaryService;
-        var characteristics = json.characteristics.map(function (serialized) { return Characteristic_1.Characteristic.deserialize(serialized); });
+        const characteristics = json.characteristics.map(serialized => Characteristic_1.Characteristic.deserialize(serialized));
         service._sideloadCharacteristics(characteristics);
         if (json.optionalCharacteristics) {
-            service.optionalCharacteristics = json.optionalCharacteristics.map(function (serialized) { return Characteristic_1.Characteristic.deserialize(serialized); });
+            service.optionalCharacteristics = json.optionalCharacteristics.map(serialized => Characteristic_1.Characteristic.deserialize(serialized));
         }
         return service;
-    };
-    return Service;
-}(events_1.EventEmitter));
+    }
+}
 exports.Service = Service;
 // We have a cyclic dependency problem. Within this file we have the definitions of "./definitions" as
 // type imports only (in order to define the static properties). Setting those properties is done outside