@pietrolubini/homebridge-ecoflow 1.6.0-alpha.0 → 1.6.0

package/dist/services/fanServiceBase.js

@@ -5,7 +5,9 @@ const serviceBase_1 = require("@ecoflow/services/serviceBase");
 class FanServiceBase extends serviceBase_1.ServiceBase {
     ecoFlowAccessory;
     maxRotationSpeed;
-    currentRotationSpeed = 0;
+    state = false;
+    rotationSpeedPercents = 0;
+    rotationSpeed = 0;
     rotationSpeedCharacteristic = null;
     constructor(ecoFlowAccessory, maxRotationSpeed, serviceSubType) {
         super(ecoFlowAccessory.platform.Service.Fan, ecoFlowAccessory, serviceSubType);
@@ -13,26 +15,30 @@ class FanServiceBase extends serviceBase_1.ServiceBase {
         this.maxRotationSpeed = maxRotationSpeed;
     }
     addCharacteristics() {
-        const onCharacteristic = this.addCharacteristic(this.platform.Characteristic.On);
-        onCharacteristic.onSet(value => {
-            const newValue = value;
-            this.processOnSetOn(newValue, () => this.updateState(!newValue));
-        });
-        this.rotationSpeedCharacteristic = this.addCharacteristic(this.platform.Characteristic.RotationSpeed);
-        this.rotationSpeedCharacteristic.onSet(percents => {
-            const prevRotationSpeed = this.currentRotationSpeed;
-            this.currentRotationSpeed = this.covertPercentsToValue(percents, this.maxRotationSpeed);
-            this.processOnSetRotationSpeed(this.currentRotationSpeed, () => this.updateRotationSpeed(prevRotationSpeed));
-        });
+        const onCharacteristic = this.addCharacteristic(this.platform.Characteristic.On)
+            .onGet(() => this.processOnGet(this.state))
+            .onSet(value => this.processOnSet(this.platform.Characteristic.On.name, () => {
+            this.state = value;
+            this.processOnSetOn(this.state, () => this.updateState(!this.state));
+        }));
+        this.rotationSpeedCharacteristic = this.addCharacteristic(this.platform.Characteristic.RotationSpeed)
+            .onGet(() => this.processOnGet(this.rotationSpeedPercents))
+            .onSet(percents => this.processOnSet(this.platform.Characteristic.RotationSpeed.name, () => {
+            this.rotationSpeedPercents = percents;
+            const prevRotationSpeed = this.rotationSpeed;
+            this.rotationSpeed = this.covertPercentsToValue(this.rotationSpeedPercents, this.maxRotationSpeed);
+            this.processOnSetRotationSpeed(this.rotationSpeed, () => this.updateRotationSpeed(prevRotationSpeed));
+        }));
         return [onCharacteristic, this.rotationSpeedCharacteristic];
     }
     updateState(state) {
+        this.state = state;
         this.updateCharacteristic(this.platform.Characteristic.On, 'State', state);
     }
     updateRotationSpeed(value) {
-        const percents = this.covertValueToPercents(value, this.maxRotationSpeed);
-        this.updateCharacteristic(this.platform.Characteristic.RotationSpeed, 'RotationSpeed', percents);
-        this.currentRotationSpeed = value;
+        this.rotationSpeedPercents = this.covertValueToPercents(value, this.maxRotationSpeed);
+        this.updateCharacteristic(this.platform.Characteristic.RotationSpeed, 'RotationSpeed', this.rotationSpeedPercents);
+        this.rotationSpeed = value;
     }
     setRotationSpeed(value) {
         this.rotationSpeedCharacteristic?.setValue(value);

package/dist/services/fanServiceBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"fanServiceBase.js","sourceRoot":"","sources":["../../src/services/fanServiceBase.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAG5D,MAAsB,cAAe,SAAQ,yBAAW;IAKjC;IACF;IALX,oBAAoB,GAAG,CAAC,CAAC;IACzB,2BAA2B,GAA0B,IAAI,CAAC;IAElE,YACqB,gBAAsC,EACxC,gBAAwB,EACzC,cAAsB;QAEtB,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;QAJ5D,qBAAgB,GAAhB,gBAAgB,CAAsB;QACxC,qBAAgB,GAAhB,gBAAgB,CAAQ;IAI3C,CAAC;IAEkB,kBAAkB;QACnC,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QACjF,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YAC7B,MAAM,QAAQ,GAAG,KAAgB,CAAC;YAClC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QACtG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YAChD,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CAAC;YACpD,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAkB,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAClG,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAC/G,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAC9D,CAAC;IAEM,WAAW,CAAC,KAAc;QAC/B,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7E,CAAC;IAEM,mBAAmB,CAAC,KAAa;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC1E,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAC;QACjG,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC;IACpC,CAAC;IAES,gBAAgB,CAAC,KAAa;QACtC,IAAI,CAAC,2BAA2B,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpD,CAAC;CAKF;AA9CD,wCA8CC"}
+{"version":3,"file":"fanServiceBase.js","sourceRoot":"","sources":["../../src/services/fanServiceBase.ts"],"names":[],"mappings":"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"}

package/dist/services/lightBulbServiceBase.d.ts

@@ -4,7 +4,9 @@ import { Characteristic } from 'homebridge';
 export declare abstract class LightBulbServiceBase extends ServiceBase {
     protected readonly ecoFlowAccessory: EcoFlowAccessoryBase;
     private readonly maxBrightness;
-    private currentBrightness;
+    private state;
+    private brightnessPercents;
+    private brightness;
     private brightnessCharacteristic;
     constructor(ecoFlowAccessory: EcoFlowAccessoryBase, maxBrightness: number, serviceSubType: string);
     protected addCharacteristics(): Characteristic[];

package/dist/services/lightBulbServiceBase.js

@@ -5,7 +5,9 @@ const serviceBase_1 = require("@ecoflow/services/serviceBase");
 class LightBulbServiceBase extends serviceBase_1.ServiceBase {
     ecoFlowAccessory;
     maxBrightness;
-    currentBrightness = 0;
+    state = false;
+    brightnessPercents = 0;
+    brightness = 0;
     brightnessCharacteristic = null;
     constructor(ecoFlowAccessory, maxBrightness, serviceSubType) {
         super(ecoFlowAccessory.platform.Service.Lightbulb, ecoFlowAccessory, serviceSubType);
@@ -13,26 +15,30 @@ class LightBulbServiceBase extends serviceBase_1.ServiceBase {
         this.maxBrightness = maxBrightness;
     }
     addCharacteristics() {
-        const onCharacteristic = this.addCharacteristic(this.platform.Characteristic.On);
-        onCharacteristic.onSet(value => {
-            const newValue = value;
-            this.processOnSetOn(newValue, () => this.updateState(!newValue));
-        });
-        this.brightnessCharacteristic = this.addCharacteristic(this.platform.Characteristic.Brightness);
-        this.brightnessCharacteristic.onSet(percents => {
-            const prevBrightness = this.currentBrightness;
-            this.currentBrightness = this.covertPercentsToValue(percents, this.maxBrightness);
-            this.processOnSetBrightness(this.currentBrightness, () => this.updateBrightness(prevBrightness));
-        });
+        const onCharacteristic = this.addCharacteristic(this.platform.Characteristic.On)
+            .onGet(() => this.processOnGet(this.state))
+            .onSet(value => this.processOnSet(this.platform.Characteristic.On.name, () => {
+            this.state = value;
+            this.processOnSetOn(this.state, () => this.updateState(!this.state));
+        }));
+        this.brightnessCharacteristic = this.addCharacteristic(this.platform.Characteristic.Brightness)
+            .onGet(() => this.processOnGet(this.brightnessPercents))
+            .onSet(percents => this.processOnSet(this.platform.Characteristic.Brightness.name, () => {
+            this.brightnessPercents = percents;
+            const prevBrightness = this.brightness;
+            this.brightness = this.covertPercentsToValue(this.brightnessPercents, this.maxBrightness);
+            this.processOnSetBrightness(this.brightness, () => this.updateBrightness(prevBrightness));
+        }));
         return [onCharacteristic, this.brightnessCharacteristic];
     }
     updateState(state) {
+        this.state = state;
         this.updateCharacteristic(this.platform.Characteristic.On, 'State', state);
     }
     updateBrightness(value) {
-        const percents = this.covertValueToPercents(value, this.maxBrightness);
-        this.updateCharacteristic(this.platform.Characteristic.Brightness, 'Brightness', percents);
-        this.currentBrightness = value;
+        this.brightnessPercents = this.covertValueToPercents(value, this.maxBrightness);
+        this.updateCharacteristic(this.platform.Characteristic.Brightness, 'Brightness', this.brightnessPercents);
+        this.brightness = value;
     }
     setBrightness(value) {
         this.brightnessCharacteristic?.setValue(value);

package/dist/services/lightBulbServiceBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"lightBulbServiceBase.js","sourceRoot":"","sources":["../../src/services/lightBulbServiceBase.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAG5D,MAAsB,oBAAqB,SAAQ,yBAAW;IAKvC;IACF;IALX,iBAAiB,GAAG,CAAC,CAAC;IACtB,wBAAwB,GAA0B,IAAI,CAAC;IAE/D,YACqB,gBAAsC,EACxC,aAAqB,EACtC,cAAsB;QAEtB,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;QAJlE,qBAAgB,GAAhB,gBAAgB,CAAsB;QACxC,kBAAa,GAAb,aAAa,CAAQ;IAIxC,CAAC;IAEkB,kBAAkB;QACnC,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QACjF,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YAC7B,MAAM,QAAQ,GAAG,KAAgB,CAAC;YAClC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QAChG,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YAC7C,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC;YAC9C,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAkB,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YAC5F,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAC;QACnG,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAC;IAC3D,CAAC;IAEM,WAAW,CAAC,KAAc;QAC/B,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7E,CAAC;IAEM,gBAAgB,CAAC,KAAa;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QACvE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;QAC3F,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;IACjC,CAAC;IAES,aAAa,CAAC,KAAa;QACnC,IAAI,CAAC,wBAAwB,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;CAKF;AA9CD,oDA8CC"}
+{"version":3,"file":"lightBulbServiceBase.js","sourceRoot":"","sources":["../../src/services/lightBulbServiceBase.ts"],"names":[],"mappings":"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"}

package/dist/{accessories/powerstream/services/outletInvService.d.ts → services/outletReadOnlyService.d.ts}

@@ -2,7 +2,7 @@ import { EcoFlowAccessoryBase } from '@ecoflow/accessories/ecoFlowAccessoryBase'
 import { AdditionalBatteryCharacteristicType as CharacteristicType } from '@ecoflow/config';
 import { BatteryStatusProvider } from '@ecoflow/helpers/batteryStatusProvider';
 import { OutletBatteryServiceBase } from '@ecoflow/services/outletBatteryServiceBase';
-export declare class OutletInvService extends OutletBatteryServiceBase {
-    constructor(ecoFlowAccessory: EcoFlowAccessoryBase, batteryStatusProvider: BatteryStatusProvider, additionalCharacteristics?: CharacteristicType[]);
+export declare class OutletReadOnlyService extends OutletBatteryServiceBase {
+    constructor(ecoFlowAccessory: EcoFlowAccessoryBase, batteryStatusProvider: BatteryStatusProvider, serviceSubType: string, additionalCharacteristics?: CharacteristicType[]);
     protected processOnSetOn(): Promise<void>;
 }

package/dist/{accessories/powerstream/services/outletService.js → services/outletReadOnlyService.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OutletService = void 0;
+exports.OutletReadOnlyService = void 0;
 const outletBatteryServiceBase_1 = require("@ecoflow/services/outletBatteryServiceBase");
-class OutletService extends outletBatteryServiceBase_1.OutletBatteryServiceBase {
+class OutletReadOnlyService extends outletBatteryServiceBase_1.OutletBatteryServiceBase {
     constructor(ecoFlowAccessory, batteryStatusProvider, serviceSubType, additionalCharacteristics) {
         super(ecoFlowAccessory, batteryStatusProvider, serviceSubType, additionalCharacteristics);
     }
@@ -10,5 +10,5 @@ class OutletService extends outletBatteryServiceBase_1.OutletBatteryServiceBase
         throw new this.platform.api.hap.HapStatusError(-70404 /* this.platform.api.hap.HAPStatus.READ_ONLY_CHARACTERISTIC */);
     }
 }
-exports.OutletService = OutletService;
-//# sourceMappingURL=outletService.js.map
+exports.OutletReadOnlyService = OutletReadOnlyService;
+//# sourceMappingURL=outletReadOnlyService.js.map

package/dist/services/outletReadOnlyService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"outletReadOnlyService.js","sourceRoot":"","sources":["../../src/services/outletReadOnlyService.ts"],"names":[],"mappings":";;;AAGA,yFAAsF;AAEtF,MAAa,qBAAsB,SAAQ,mDAAwB;IACjE,YACE,gBAAsC,EACtC,qBAA4C,EAC5C,cAAsB,EACtB,yBAAgD;QAEhD,KAAK,CAAC,gBAAgB,EAAE,qBAAqB,EAAE,cAAc,EAAE,yBAAyB,CAAC,CAAC;IAC5F,CAAC;IAEkB,cAAc;QAC/B,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,uEAA0D,CAAC;IAC3G,CAAC;CACF;AAbD,sDAaC"}

package/dist/services/outletServiceBase.d.ts

@@ -3,6 +3,7 @@ import { ServiceBase } from '@ecoflow/services/serviceBase';
 import { Characteristic, CharacteristicValue, WithUUID } from 'homebridge';
 export declare abstract class OutletServiceBase extends ServiceBase {
     private readonly additionalCharacteristics?;
+    private state;
     constructor(ecoFlowAccessory: EcoFlowAccessoryBase, additionalCharacteristics?: string[] | undefined, serviceSubType?: string);
     updateState(state: boolean): void;
     updateOutputConsumption(watt: number): void;

package/dist/services/outletServiceBase.js

@@ -5,11 +5,13 @@ const config_1 = require("@ecoflow/config");
 const serviceBase_1 = require("@ecoflow/services/serviceBase");
 class OutletServiceBase extends serviceBase_1.ServiceBase {
     additionalCharacteristics;
+    state = false;
     constructor(ecoFlowAccessory, additionalCharacteristics, serviceSubType) {
         super(ecoFlowAccessory.platform.Service.Outlet, ecoFlowAccessory, serviceSubType);
         this.additionalCharacteristics = additionalCharacteristics;
     }
     updateState(state) {
+        this.state = state;
         this.updateCharacteristic(this.platform.Characteristic.On, 'State', state);
     }
     updateOutputConsumption(watt) {
@@ -23,11 +25,12 @@ class OutletServiceBase extends serviceBase_1.ServiceBase {
         this.updateCustomCharacteristic(this.platform.Characteristic.PowerConsumption.OutputCurrent, 'Output Current, A', () => ampere, config_1.AdditionalOutletCharacteristicType.OutputCurrent);
     }
     addCharacteristics() {
-        const onCharacteristic = this.addCharacteristic(this.platform.Characteristic.On);
-        onCharacteristic.onSet((value) => {
-            const newValue = value;
-            this.processOnSetOn(newValue, () => this.updateState(!newValue));
-        });
+        const onCharacteristic = this.addCharacteristic(this.platform.Characteristic.On)
+            .onGet(() => this.processOnGet(this.state))
+            .onSet((value) => this.processOnSet(this.platform.Characteristic.On.name, () => {
+            this.state = value;
+            this.processOnSetOn(this.state, () => this.updateState(!this.state));
+        }));
         const characteristics = [
             this.addCharacteristic(this.platform.Characteristic.OutletInUse),
             onCharacteristic,

package/dist/services/outletServiceBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"outletServiceBase.js","sourceRoot":"","sources":["../../src/services/outletServiceBase.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"outletServiceBase.js","sourceRoot":"","sources":["../../src/services/outletServiceBase.ts"],"names":[],"mappings":"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"}

package/dist/services/serviceBase.d.ts

@@ -9,12 +9,14 @@ export declare abstract class ServiceBase {
     protected readonly platform: EcoFlowHomebridgePlatform;
     protected characteristics: Characteristic[];
     private _service;
+    private isReachable;
     private enabled;
     constructor(serviceType: WithUUID<typeof Service>, ecoFlowAccessory: EcoFlowAccessoryBase, serviceSubType?: string | undefined);
     initialize(): void;
     cleanupCharacteristics(): void;
     get service(): Service;
     updateEnabled(enabled: boolean): void;
+    updateReachability(value: boolean): void;
     protected get serviceName(): string;
     protected createService(): Service;
     protected abstract addCharacteristics(): Characteristic[];
@@ -29,5 +31,8 @@ export declare abstract class ServiceBase {
     protected covertPercentsToValue(percents: number, maxValue: number): number;
     protected covertValueToPercents(value: number, maxValue: number): number;
     protected onDisabled(): void;
-    protected addCharacteristicSet(characteristic: Characteristic, name: string, process: (value: CharacteristicValue) => void): void;
+    protected processOnGet<TValue>(value: TValue): TValue;
+    protected processOnSet(name: string, func: () => void): void;
+    private checkIsReachable;
+    private checkIsEnabled;
 }

package/dist/services/serviceBase.js

@@ -9,6 +9,7 @@ class ServiceBase {
     platform;
     characteristics = [];
     _service = null;
+    isReachable = true;
     enabled = true;
     constructor(serviceType, ecoFlowAccessory, serviceSubType) {
         this.serviceType = serviceType;
@@ -44,6 +45,9 @@ class ServiceBase {
             this.onDisabled();
         }
     }
+    updateReachability(value) {
+        this.isReachable = value;
+    }
     get serviceName() {
         return this.ecoFlowAccessory.config.name + (this.serviceSubType ? ` ${this.serviceSubType}` : '');
     }
@@ -78,16 +82,25 @@ class ServiceBase {
         return (value * 100) / maxValue;
     }
     onDisabled() { }
-    addCharacteristicSet(characteristic, name, process) {
-        characteristic.onSet((value) => {
-            if (!this.enabled) {
-                this.log.warn(`[${this.serviceName}] Service is disabled. Setting of "${name}" is disallowed`);
-                throw new this.platform.api.hap.HapStatusError(-70404 /* this.platform.api.hap.HAPStatus.READ_ONLY_CHARACTERISTIC */);
-            }
-            else {
-                process(value);
-            }
-        });
+    processOnGet(value) {
+        this.checkIsReachable();
+        return value;
+    }
+    processOnSet(name, func) {
+        this.checkIsReachable();
+        this.checkIsEnabled(name);
+        func();
+    }
+    checkIsReachable() {
+        if (!this.isReachable) {
+            throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
+        }
+    }
+    checkIsEnabled(name) {
+        if (!this.enabled) {
+            this.log.warn(`[${this.serviceName}] Service is disabled. Setting of "${name}" is disallowed`);
+            throw new this.platform.api.hap.HapStatusError(-70404 /* this.platform.api.hap.HAPStatus.READ_ONLY_CHARACTERISTIC */);
+        }
     }
 }
 exports.ServiceBase = ServiceBase;

package/dist/services/serviceBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"serviceBase.js","sourceRoot":"","sources":["../../src/services/serviceBase.ts"],"names":[],"mappings":";;;AAIA,MAAsB,WAAW;IAQZ;IACE;IACA;IATF,GAAG,CAAU;IACb,QAAQ,CAA4B;IAC7C,eAAe,GAAqB,EAAE,CAAC;IACzC,QAAQ,GAAmB,IAAI,CAAC;IAChC,OAAO,GAAY,IAAI,CAAC;IAEhC,YACmB,WAAqC,EACnC,gBAAsC,EACtC,cAAuB;QAFzB,gBAAW,GAAX,WAAW,CAA0B;QACnC,qBAAgB,GAAhB,gBAAgB,CAAsB;QACtC,mBAAc,GAAd,cAAc,CAAS;QAE1C,IAAI,CAAC,GAAG,GAAG,gBAAgB,CAAC,GAAG,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC;IAC5C,CAAC;IAEM,UAAU;QACf,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACrC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACjD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;IACvF,CAAC;IAEM,sBAAsB;QAC3B,IAAI,CAAC,OAAO,CAAC,eAAe;aACzB,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;aACxE,OAAO,CAAC,cAAc,CAAC,EAAE;YACxB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,qCAAqC,EAAE,cAAc,CAAC,WAAW,CAAC,CAAC;YAC7G,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACP,CAAC;IAED,qBAAqB;IACrB,IAAW,OAAO;QAChB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACrE,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1E,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAEM,aAAa,CAAC,OAAgB;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,CAAC;IACH,CAAC;IAED,IAAc,WAAW;QACvB,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACpG,CAAC;IAES,aAAa;QACrB,OAAO,IAAI,CAAC,cAAc;YACxB,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC;YACnF,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAChF,CAAC;IAIS,iBAAiB,CAAC,cAAoD;QAC9E,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;IACxD,CAAC;IAES,eAAe,CAAC,OAAiC,EAAE,WAAoB;QAC/E,MAAM,MAAM,GACV,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC;YACnD,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACjF,MAAM,CAAC,WAAW,GAAG,WAAW,IAAI,MAAM,CAAC,WAAW,CAAC;QAEvD,OAAO,MAAM,CAAC;IAChB,CAAC;IAES,mBAAmB,CAC3B,OAAiC,EACjC,WAAmB,EACnB,cAAsB;QAEtB,MAAM,MAAM,GACV,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,cAAc,CAAC;YACvE,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;QAEnF,OAAO,MAAM,CAAC;IAChB,CAAC;IAES,oBAAoB,CAC5B,cAAoD,EACpD,IAAY,EACZ,KAA0B;QAE1B,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,cAAc,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAC5F,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,OAAO,KAAK,EAAE,KAAK,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACpE,CAAC;IAES,qBAAqB,CAAC,QAAgB,EAAE,QAAgB;QAChE,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC,GAAG,GAAG,CAAC;IACrC,CAAC;IAES,qBAAqB,CAAC,KAAa,EAAE,QAAgB;QAC7D,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,QAAQ,CAAC;IAClC,CAAC;IAES,UAAU,KAAU,CAAC;IAErB,oBAAoB,CAC5B,cAA8B,EAC9B,IAAY,EACZ,OAA6C;QAE7C,cAAc,CAAC,KAAK,CAAC,CAAC,KAA0B,EAAE,EAAE;YAClD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,sCAAsC,IAAI,iBAAiB,CAAC,CAAC;gBAC/F,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,uEAA0D,CAAC;YAC3G,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAtHD,kCAsHC"}
+{"version":3,"file":"serviceBase.js","sourceRoot":"","sources":["../../src/services/serviceBase.ts"],"names":[],"mappings":"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"}

package/dist/services/switchServiceBase.d.ts

@@ -2,6 +2,7 @@ import { EcoFlowAccessoryBase } from '@ecoflow/accessories/ecoFlowAccessoryBase'
 import { ServiceBase } from '@ecoflow/services/serviceBase';
 import { Characteristic } from 'homebridge';
 export declare abstract class SwitchServiceBase extends ServiceBase {
+    private state;
     constructor(ecoFlowAccessory: EcoFlowAccessoryBase, serviceSubType: string);
     updateState(state: boolean): void;
     protected onDisabled(): void;

package/dist/services/switchServiceBase.js

@@ -3,21 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SwitchServiceBase = void 0;
 const serviceBase_1 = require("@ecoflow/services/serviceBase");
 class SwitchServiceBase extends serviceBase_1.ServiceBase {
+    state = false;
     constructor(ecoFlowAccessory, serviceSubType) {
         super(ecoFlowAccessory.platform.Service.Switch, ecoFlowAccessory, serviceSubType);
     }
     updateState(state) {
+        this.state = state;
         this.updateCharacteristic(this.platform.Characteristic.On, 'State', state);
     }
     onDisabled() {
         this.updateState(false);
     }
     addCharacteristics() {
-        const onCharacteristic = this.addCharacteristic(this.platform.Characteristic.On);
-        this.addCharacteristicSet(onCharacteristic, 'On', (value) => {
-            const newValue = value;
-            this.processOnSetOn(newValue, () => this.updateState(!newValue));
-        });
+        const onCharacteristic = this.addCharacteristic(this.platform.Characteristic.On)
+            .onGet(() => this.processOnGet(this.state))
+            .onSet((value) => this.processOnSet(this.platform.Characteristic.On.name, () => {
+            this.state = value;
+            this.processOnSetOn(this.state, () => this.updateState(!this.state));
+        }));
         this.service.setCharacteristic(this.platform.Characteristic.Name, this.serviceName);
         return [onCharacteristic];
     }

package/dist/services/switchServiceBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"switchServiceBase.js","sourceRoot":"","sources":["../../src/services/switchServiceBase.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAG5D,MAAsB,iBAAkB,SAAQ,yBAAW;IACzD,YAAY,gBAAsC,EAAE,cAAsB;QACxE,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;IACpF,CAAC;IAEM,WAAW,CAAC,KAAc;QAC/B,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7E,CAAC;IAEkB,UAAU;QAC3B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IAEkB,kBAAkB;QACnC,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QACjF,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC,KAA0B,EAAE,EAAE;YAC/E,MAAM,QAAQ,GAAG,KAAgB,CAAC;YAClC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAEpF,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC5B,CAAC;CAGF;AA1BD,8CA0BC"}
+{"version":3,"file":"switchServiceBase.js","sourceRoot":"","sources":["../../src/services/switchServiceBase.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAG5D,MAAsB,iBAAkB,SAAQ,yBAAW;IACjD,KAAK,GAAY,KAAK,CAAC;IAE/B,YAAY,gBAAsC,EAAE,cAAsB;QACxE,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;IACpF,CAAC;IAEM,WAAW,CAAC,KAAc;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7E,CAAC;IAEkB,UAAU;QAC3B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IAEkB,kBAAkB;QACnC,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;aAC7E,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC1C,KAAK,CAAC,CAAC,KAA0B,EAAE,EAAE,CACpC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE;YAC3D,IAAI,CAAC,KAAK,GAAG,KAAgB,CAAC;YAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QACvE,CAAC,CAAC,CACH,CAAC;QAEJ,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAEpF,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC5B,CAAC;CAGF;AAhCD,8CAgCC"}

package/dist/services/temperatureSensorService.d.ts

@@ -3,7 +3,7 @@ import { ServiceBase } from '@ecoflow/services/serviceBase';
 import { Characteristic } from 'homebridge';
 export declare class TemperatureSensorService extends ServiceBase {
     protected readonly ecoFlowAccessory: EcoFlowAccessoryBase;
-    private temperatureCharacteristic;
+    private currentTemperature;
     constructor(ecoFlowAccessory: EcoFlowAccessoryBase, serviceSubType?: string);
     protected addCharacteristics(): Characteristic[];
     updateCurrentTemperature(value: number): void;

package/dist/services/temperatureSensorService.js

@@ -4,16 +4,17 @@ exports.TemperatureSensorService = void 0;
 const serviceBase_1 = require("@ecoflow/services/serviceBase");
 class TemperatureSensorService extends serviceBase_1.ServiceBase {
     ecoFlowAccessory;
-    temperatureCharacteristic = null;
+    currentTemperature = 0;
     constructor(ecoFlowAccessory, serviceSubType) {
         super(ecoFlowAccessory.platform.Service.TemperatureSensor, ecoFlowAccessory, serviceSubType);
         this.ecoFlowAccessory = ecoFlowAccessory;
     }
     addCharacteristics() {
-        this.temperatureCharacteristic = this.addCharacteristic(this.platform.Characteristic.CurrentTemperature);
-        return [this.temperatureCharacteristic];
+        const temperatureCharacteristic = this.addCharacteristic(this.platform.Characteristic.CurrentTemperature).onGet(() => this.processOnGet(this.currentTemperature));
+        return [temperatureCharacteristic];
     }
     updateCurrentTemperature(value) {
+        this.currentTemperature = value;
         this.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, 'Current Temperature', value);
     }
 }

package/dist/services/temperatureSensorService.js.map

@@ -1 +1 @@
-{"version":3,"file":"temperatureSensorService.js","sourceRoot":"","sources":["../../src/services/temperatureSensorService.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAG5D,MAAa,wBAAyB,SAAQ,yBAAW;IAIlC;IAHb,yBAAyB,GAA0B,IAAI,CAAC;IAEhE,YACqB,gBAAsC,EACzD,cAAuB;QAEvB,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;QAH1E,qBAAgB,GAAhB,gBAAgB,CAAsB;IAI3D,CAAC;IAEkB,kBAAkB;QACnC,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;QACzG,OAAO,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IAC1C,CAAC;IAEM,wBAAwB,CAAC,KAAa;QAC3C,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,EAAE,qBAAqB,EAAE,KAAK,CAAC,CAAC;IAC3G,CAAC;CACF;AAlBD,4DAkBC"}
+{"version":3,"file":"temperatureSensorService.js","sourceRoot":"","sources":["../../src/services/temperatureSensorService.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAG5D,MAAa,wBAAyB,SAAQ,yBAAW;IAIlC;IAHb,kBAAkB,GAAW,CAAC,CAAC;IAEvC,YACqB,gBAAsC,EACzD,cAAuB;QAEvB,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;QAH1E,qBAAgB,GAAhB,gBAAgB,CAAsB;IAI3D,CAAC;IAEkB,kBAAkB;QACnC,MAAM,yBAAyB,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,KAAK,CAC7G,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CACjD,CAAC;QACF,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACrC,CAAC;IAEM,wBAAwB,CAAC,KAAa;QAC3C,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC;QAChC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,EAAE,qBAAqB,EAAE,KAAK,CAAC,CAAC;IAC3G,CAAC;CACF;AArBD,4DAqBC"}

package/dist/services/thermostatFridgeServiceBase.d.ts

@@ -5,9 +5,12 @@ import { Characteristic } from 'homebridge';
 export declare abstract class ThermostatFridgeServiceBase extends ServiceBase {
     private readonly minTemperature;
     private readonly maxTemperature;
-    private currentTargetTemperature;
-    private currentTargetFridgeState;
-    private currentTemperatureDisplayUnits;
+    private currentTemperature;
+    private targetTemperature;
+    private currentHeatingCoolingStateType;
+    private targetHeatingCoolingStateType;
+    private targetFridgeState;
+    private temperatureDisplayUnits;
     constructor(ecoFlowAccessory: EcoFlowAccessoryBase, minTemperature: number, maxTemperature: number, serviceSubType: string);
     updateCurrentTemperature(value: number): void;
     updateTargetTemperature(value: number): void;

package/dist/services/thermostatFridgeServiceBase.js

@@ -6,27 +6,37 @@ const serviceBase_1 = require("@ecoflow/services/serviceBase");
 class ThermostatFridgeServiceBase extends serviceBase_1.ServiceBase {
     minTemperature;
     maxTemperature;
-    currentTargetTemperature = 0;
-    currentTargetFridgeState = characteristicContracts_1.FridgeStateType.Off;
-    currentTemperatureDisplayUnits = 0;
+    currentTemperature = 0;
+    targetTemperature = 0;
+    currentHeatingCoolingStateType = characteristicContracts_1.CurrentHeatingCoolingStateType.Off;
+    targetHeatingCoolingStateType = characteristicContracts_1.TargetHeatingCoolingStateType.Off;
+    targetFridgeState = characteristicContracts_1.FridgeStateType.Off;
+    temperatureDisplayUnits = 0;
     constructor(ecoFlowAccessory, minTemperature, maxTemperature, serviceSubType) {
         super(ecoFlowAccessory.platform.Service.Thermostat, ecoFlowAccessory, serviceSubType);
         this.minTemperature = minTemperature;
         this.maxTemperature = maxTemperature;
     }
     updateCurrentTemperature(value) {
+        this.currentTemperature = value;
         this.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, 'Current Temperature', value);
     }
     updateTargetTemperature(value) {
+        this.targetTemperature = value;
         this.updateCharacteristic(this.platform.Characteristic.TargetTemperature, 'Target Temperature', value);
     }
     updateCurrentState(value) {
-        this.updateCharacteristic(this.platform.Characteristic.CurrentHeatingCoolingState, 'Current State', value === characteristicContracts_1.FridgeStateType.On ? characteristicContracts_1.CurrentHeatingCoolingStateType.Cool : characteristicContracts_1.CurrentHeatingCoolingStateType.Off);
+        this.currentHeatingCoolingStateType =
+            value === characteristicContracts_1.FridgeStateType.On ? characteristicContracts_1.CurrentHeatingCoolingStateType.Cool : characteristicContracts_1.CurrentHeatingCoolingStateType.Off;
+        this.updateCharacteristic(this.platform.Characteristic.CurrentHeatingCoolingState, 'Current State', this.currentHeatingCoolingStateType);
     }
     updateTargetState(value) {
-        this.updateCharacteristic(this.platform.Characteristic.TargetHeatingCoolingState, 'Target State', value === characteristicContracts_1.FridgeStateType.On ? characteristicContracts_1.TargetHeatingCoolingStateType.Cool : characteristicContracts_1.TargetHeatingCoolingStateType.Off);
+        this.targetHeatingCoolingStateType =
+            value === characteristicContracts_1.FridgeStateType.On ? characteristicContracts_1.TargetHeatingCoolingStateType.Cool : characteristicContracts_1.TargetHeatingCoolingStateType.Off;
+        this.updateCharacteristic(this.platform.Characteristic.TargetHeatingCoolingState, 'Target State', this.targetHeatingCoolingStateType);
     }
     updateTemperatureDisplayUnits(value) {
+        this.temperatureDisplayUnits = value;
         this.updateCharacteristic(this.platform.Characteristic.TemperatureDisplayUnits, 'Temperature Display Units', value);
     }
     addCharacteristics() {
@@ -41,53 +51,63 @@ class ThermostatFridgeServiceBase extends serviceBase_1.ServiceBase {
         return characteristics;
     }
     addCurrentTemperatureCharacteristic() {
-        const characteristic = this.addCharacteristic(this.platform.Characteristic.CurrentTemperature).setProps({
+        const characteristic = this.addCharacteristic(this.platform.Characteristic.CurrentTemperature)
+            .setProps({
             minValue: this.minTemperature,
             maxValue: this.maxTemperature,
             minStep: 0.1,
-        });
+        })
+            .onGet(() => this.processOnGet(this.currentTemperature));
         return characteristic;
     }
     addTargetTemperatureCharacteristic() {
-        const characteristic = this.addCharacteristic(this.platform.Characteristic.TargetTemperature).setProps({
+        const characteristic = this.addCharacteristic(this.platform.Characteristic.TargetTemperature)
+            .setProps({
             minValue: this.minTemperature,
             maxValue: this.maxTemperature,
             minStep: 0.1,
-        });
-        this.addCharacteristicSet(characteristic, 'TargetTemperature', (value) => {
-            const prevTargetTemperature = this.currentTargetTemperature;
-            this.currentTargetTemperature = value;
-            this.processOnSetTargetTemperature(this.currentTargetTemperature, () => this.updateTargetTemperature(prevTargetTemperature));
-        });
+        })
+            .onGet(() => this.processOnGet(this.targetTemperature))
+            .onSet((value) => this.processOnSet(this.platform.Characteristic.TargetTemperature.name, () => {
+            const prevTargetTemperature = this.targetTemperature;
+            this.targetTemperature = value;
+            this.processOnSetTargetTemperature(this.targetTemperature, () => this.updateTargetTemperature(prevTargetTemperature));
+        }));
         return characteristic;
     }
     addCurrentHeatingCoolingStateCharacteristic() {
-        const characteristic = this.addCharacteristic(this.platform.Characteristic.CurrentHeatingCoolingState).setProps({
+        const characteristic = this.addCharacteristic(this.platform.Characteristic.CurrentHeatingCoolingState)
+            .setProps({
             validValues: [characteristicContracts_1.TargetHeatingCoolingStateType.Off, characteristicContracts_1.TargetHeatingCoolingStateType.Cool],
-        });
+        })
+            .onGet(() => this.processOnGet(this.currentHeatingCoolingStateType));
         return characteristic;
     }
     addTargetHeatingCoolingStateCharacteristic() {
-        const characteristic = this.addCharacteristic(this.platform.Characteristic.TargetHeatingCoolingState).setProps({
+        const characteristic = this.addCharacteristic(this.platform.Characteristic.TargetHeatingCoolingState)
+            .setProps({
             validValues: [characteristicContracts_1.TargetHeatingCoolingStateType.Off, characteristicContracts_1.TargetHeatingCoolingStateType.Cool],
-        });
-        this.addCharacteristicSet(characteristic, 'TargetHeatingCoolingState', (value) => {
-            const prevTargetFridgeState = this.currentTargetFridgeState;
-            this.currentTargetFridgeState =
-                value === characteristicContracts_1.TargetHeatingCoolingStateType.Cool
+        })
+            .onGet(() => this.processOnGet(this.targetHeatingCoolingStateType))
+            .onSet((value) => this.processOnSet(this.platform.Characteristic.TargetHeatingCoolingState.name, () => {
+            this.targetHeatingCoolingStateType = value;
+            const prevTargetFridgeState = this.targetFridgeState;
+            this.targetFridgeState =
+                this.targetHeatingCoolingStateType === characteristicContracts_1.TargetHeatingCoolingStateType.Cool
                     ? characteristicContracts_1.FridgeStateType.On
                     : characteristicContracts_1.FridgeStateType.Off;
-            this.processOnSetTargetState(this.currentTargetFridgeState, () => this.updateTargetState(prevTargetFridgeState));
-        });
+            this.processOnSetTargetState(this.targetFridgeState, () => this.updateTargetState(prevTargetFridgeState));
+        }));
         return characteristic;
     }
     addTemperatureDisplayUnitsCharacteristic() {
-        const characteristic = this.addCharacteristic(this.platform.Characteristic.TemperatureDisplayUnits);
-        this.addCharacteristicSet(characteristic, 'TemperatureDisplayUnits', (value) => {
-            const prevTemperatureDisplayUnits = this.currentTemperatureDisplayUnits;
-            this.currentTemperatureDisplayUnits = value;
-            this.processOnSetTemperatureDisplayUnits(this.currentTemperatureDisplayUnits, () => this.updateTemperatureDisplayUnits(prevTemperatureDisplayUnits));
-        });
+        const characteristic = this.addCharacteristic(this.platform.Characteristic.TemperatureDisplayUnits)
+            .onGet(() => this.processOnGet(this.temperatureDisplayUnits))
+            .onSet((value) => this.processOnSet(this.platform.Characteristic.TemperatureDisplayUnits.name, () => {
+            const prevTemperatureDisplayUnits = this.temperatureDisplayUnits;
+            this.temperatureDisplayUnits = value;
+            this.processOnSetTemperatureDisplayUnits(this.temperatureDisplayUnits, () => this.updateTemperatureDisplayUnits(prevTemperatureDisplayUnits));
+        }));
         return characteristic;
     }
 }