homebridge-carrier-infinity 1.7.0-beta.1 → 1.7.1

package/dist/characteristics_base.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccessoryInformation = exports.ThermostatCharacteristicWrapper = exports.CharacteristicWrapper = exports.MultiWrapper = void 0;
+const constants_1 = require("./api/constants");
 const helper_logging_1 = require("./helper_logging");
-const rxjs_1 = require("rxjs");
 /*
 * Helpers to add handlers to the HAP Service and Characteristic objects.
 */
@@ -33,36 +33,40 @@ class MultiWrapper extends Wrapper {
 }
 exports.MultiWrapper = MultiWrapper;
 class CharacteristicWrapper extends Wrapper {
+    constructor() {
+        super(...arguments);
+        this.props = {};
+        // used exclusively if no char value is set yet (first accessory load)
+        this.default_value = null;
+    }
     wrap(service) {
         const characteristic = service.getCharacteristic(this.ctype);
         if (this.props) {
-            this.props.subscribe(async (data) => {
-                characteristic.setProps(data);
-            });
+            characteristic.setProps(this.props);
+        }
+        if (this.get) {
+            // This magic callback schedules another async callback to actually fetch
+            // and update the characteristic. This lets us convert a sync callback to
+            // an async callback.
+            const callback = () => {
+                // Schedule async update to HK characteristic.
+                process.nextTick(async () => {
+                    if (this.get) {
+                        characteristic.updateValue(await this.get());
+                    }
+                });
+                // Return immediately with the current, stale value. This is needed for
+                // this to be a valid callback to onGet.
+                // try 1) existing value, if falsy, 2) default value, if null, 3) keep existing value
+                return characteristic.value || this.default_value || characteristic.value;
+            };
+            // Listen for HK 'get' requests. Schedule async update push to HK.
+            characteristic.onGet(callback);
+            // Listen for api updates. Schedule async update push to HK.
+            this.system.events.on(constants_1.SUBSCRIPTION.CONFIG, callback);
+            this.system.events.on(constants_1.SUBSCRIPTION.CONFIG_MUTATE, callback);
+            this.system.events.on(constants_1.SUBSCRIPTION.STATUS, callback);
         }
-        // Push updates from the system-based value observable to HK
-        this.value.subscribe(async (data) => {
-            if (characteristic.value === data) {
-                this.log.debug(`PUSH (unnecessary) Updating ${this.ctype.name} from ${characteristic.value} to ${data}`);
-            }
-            else {
-                this.log.debug(`PUSH Updating ${this.ctype.name} from ${characteristic.value} to ${data}`);
-            }
-            characteristic.updateValue(data);
-        });
-        // Make HK get requests initiate an observable update
-        characteristic.onGet(async () => {
-            // Tell the system model it should update ...
-            this.system.status.events.emit('onGet');
-            this.system.config.events.emit('onGet');
-            // ... and return immediately the last seen api value.
-            const data = await (0, rxjs_1.firstValueFrom)(this.value);
-            if (characteristic.value !== data) {
-                this.log.debug(`GET Updating ${this.ctype.name} from ${characteristic.value} to ${data}`);
-            }
-            return data;
-        });
-        // Sets call set helper which calls system model
         if (this.set) {
             characteristic.onSet(this.set.bind(this));
         }
@@ -71,11 +75,19 @@ class CharacteristicWrapper extends Wrapper {
 exports.CharacteristicWrapper = CharacteristicWrapper;
 class ThermostatCharacteristicWrapper extends CharacteristicWrapper {
     // TODO: check in constructor that context has zone and hold settings
+    async getActivity() {
+        // Vacation scheduling is weird, and changes infrequently. Just get it from status.
+        if (await this.system.status.getZoneActivity(this.context.zone) === constants_1.ACTIVITY.VACATION) {
+            return constants_1.ACTIVITY.VACATION;
+        }
+        // Config has more up to date activity settings.
+        return await this.system.config.getZoneActivity(this.context.zone);
+    }
     async getHoldTime() {
         // OTMR setting to say when manual hold should end
         switch (this.context.holdBehavior) {
             case 'activity':
-                return (0, rxjs_1.firstValueFrom)(this.system.config.getZone(this.context.zone).next_activity_time);
+                return await this.system.config.getZoneNextActivityTime(this.context.zone);
             case 'for_x': {
                 const arg = this.context.holdArgument.split(':');
                 let target_ms = (new Date()).getTime();
@@ -94,35 +106,14 @@ class ThermostatCharacteristicWrapper extends CharacteristicWrapper {
     }
 }
 exports.ThermostatCharacteristicWrapper = ThermostatCharacteristicWrapper;
-class AccessorySerial extends CharacteristicWrapper {
-    constructor() {
-        super(...arguments);
-        this.ctype = this.Characteristic.SerialNumber;
-        this.value = (0, rxjs_1.of)(this.system.serialNumber);
-    }
-}
-class AccessoryModel extends CharacteristicWrapper {
-    constructor() {
-        super(...arguments);
-        this.ctype = this.Characteristic.Model;
-        this.value = this.system.profile.model;
-    }
-}
-class AccessoryManufacturer extends CharacteristicWrapper {
-    constructor() {
-        super(...arguments);
-        this.ctype = this.Characteristic.Manufacturer;
-        this.value = this.system.profile.brand.pipe((0, rxjs_1.map)(x => `${x} Home`));
-    }
-}
-class AccessoryInformation extends MultiWrapper {
-    constructor() {
-        super(...arguments);
-        this.WRAPPERS = [
-            AccessorySerial,
-            AccessoryModel,
-            AccessoryManufacturer,
-        ];
+class AccessoryInformation extends Wrapper {
+    wrap(service) {
+        this.system.profile.fetch().then(async () => {
+            service
+                .setCharacteristic(this.Characteristic.SerialNumber, this.system.serialNumber)
+                .setCharacteristic(this.Characteristic.Manufacturer, `${await this.system.profile.getBrand()} Home`)
+                .setCharacteristic(this.Characteristic.Model, await this.system.profile.getModel());
+        });
     }
 }
 exports.AccessoryInformation = AccessoryInformation;

package/dist/characteristics_base.js.map

@@ -1 +1 @@
-{"version":3,"file":"characteristics_base.js","sourceRoot":"","sources":["../src/characteristics_base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"characteristics_base.js","sourceRoot":"","sources":["../src/characteristics_base.ts"],"names":[],"mappings":";;;AAAA,+CAAyD;AAMzD,qDAAgD;AAEhD;;EAEE;AAEF,MAAM,OAAO;IAMX,YACkB,QAA2C,EACxC,OAAuB;QAD1B,aAAQ,GAAR,QAAQ,CAAmC;QACxC,YAAO,GAAP,OAAO,CAAgB;QAP5B,YAAO,GAAmB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;QACxD,mBAAc,GAA0B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC;QAC1E,WAAM,GAAgB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACvE,QAAG,GAAW,IAAI,6BAAY,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAKnF,CAAC;IAEJ,6DAA6D;IAC7D,IAAI,CAAC,OAAgB;QACnB,OAAO;IACT,CAAC;CACF;AAED,MAAsB,YAAa,SAAQ,OAAO;IAAlD;;QACY,aAAQ,GAAqB,EAAE,CAAC;IAU5C,CAAC;IARC,IAAI,CAAC,OAAgB;QACnB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClC,IAAI,KAAK,CACP,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,OAAO,CACb,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;CACF;AAXD,oCAWC;AAED,MAAsB,qBAAsB,SAAQ,OAAO;IAA3D;;QAEY,UAAK,GAAG,EAAE,CAAC;QAGrB,sEAAsE;QAC5D,kBAAa,GAA+B,IAAI,CAAC;IAmC7D,CAAC;IAjCC,IAAI,CAAC,OAAgB;QACnB,MAAM,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7D,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACb,yEAAyE;YACzE,yEAAyE;YACzE,qBAAqB;YACrB,MAAM,QAAQ,GAAG,GAAG,EAAE;gBACpB,8CAA8C;gBAC9C,OAAO,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;oBAC1B,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;wBACb,cAAc,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;oBAC/C,CAAC;gBACH,CAAC,CAAC,CAAC;gBACH,uEAAuE;gBACvE,wCAAwC;gBACxC,qFAAqF;gBACrF,OAAO,cAAc,CAAC,KAAK,IAAI,IAAI,CAAC,aAAa,IAAI,cAAc,CAAC,KAAK,CAAC;YAC5E,CAAC,CAAC;YAEF,kEAAkE;YAClE,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC/B,4DAA4D;YAC5D,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,wBAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YACrD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,wBAAY,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;YAC5D,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,wBAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACvD,CAAC;QACD,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACb,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;CACF;AAzCD,sDAyCC;AAED,MAAsB,+BAAgC,SAAQ,qBAAqB;IACjF,qEAAqE;IAErE,KAAK,CAAC,WAAW;QACf,mFAAmF;QACnF,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,oBAAQ,CAAC,QAAQ,EAAE,CAAC;YACtF,OAAO,oBAAQ,CAAC,QAAQ,CAAC;QAC3B,CAAC;QACD,gDAAgD;QAChD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,WAAW;QACf,kDAAkD;QAClD,QAAQ,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;YAClC,KAAK,UAAU;gBACb,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC7E,KAAK,OAAO,CAAC,CAAC,CAAC;gBACb,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACjD,IAAI,SAAS,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;gBACvC,SAAS,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;gBAC7C,SAAS,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;gBACxC,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;gBACxC,OAAO,GAAG,WAAW,CAAC,QAAQ,EAAE,IAAI,WAAW,CAAC,UAAU,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;YAClF,CAAC;YACD,KAAK,SAAS;gBACZ,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC;YACnC,KAAK,SAAS;gBACZ,OAAO,EAAE,CAAC;YACZ;gBACE,OAAO,EAAE,CAAC;QACd,CAAC;IACH,CAAC;CACF;AAjCD,0EAiCC;AAED,MAAa,oBAAqB,SAAQ,OAAO;IAC/C,IAAI,CAAC,OAAgB;QACnB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAC1C,OAAO;iBACJ,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;iBAC7E,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC;iBACnG,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QACxF,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AATD,oDASC"}

package/dist/characteristics_fan.d.ts

@@ -2,26 +2,26 @@ import { CharacteristicValue } from 'homebridge';
 import { ThermostatCharacteristicWrapper, MultiWrapper } from './characteristics_base';
 declare class FanStatus extends ThermostatCharacteristicWrapper {
     ctype: typeof import("hap-nodejs/dist/lib/definitions").Active;
-    value: import("rxjs").Observable<0 | 1>;
+    get: () => Promise<0 | 1>;
     set: (value: CharacteristicValue) => Promise<void>;
 }
 declare class FanState extends ThermostatCharacteristicWrapper {
     ctype: typeof import("hap-nodejs/dist/lib/definitions").CurrentFanState;
-    value: import("rxjs").Observable<0 | 2 | 1>;
+    get: () => Promise<0 | 1 | 2>;
 }
 declare class FanSpeed extends ThermostatCharacteristicWrapper {
     ctype: typeof import("hap-nodejs/dist/lib/definitions").RotationSpeed;
-    props: import("rxjs").Observable<{
+    props: {
         minValue: number;
         maxValue: number;
         minStep: number;
-    }>;
-    value: import("rxjs").Observable<CharacteristicValue>;
+    };
+    get: () => Promise<CharacteristicValue>;
     set: (value: CharacteristicValue) => Promise<void>;
 }
 declare class TargetFanState extends ThermostatCharacteristicWrapper {
     ctype: typeof import("hap-nodejs/dist/lib/definitions").TargetFanState;
-    value: import("rxjs").Observable<0 | 1>;
+    get: () => Promise<0 | 1>;
     set: (value: CharacteristicValue) => Promise<void>;
 }
 export declare class FanService extends MultiWrapper {

package/dist/characteristics_fan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"characteristics_fan.d.ts","sourceRoot":"","sources":["../src/characteristics_fan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,+BAA+B,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAsBvF,cAAM,SAAU,SAAQ,+BAA+B;IACrD,KAAK,0DAA8B;IACnC,KAAK,mCA8BH;IAEF,GAAG,UAAiB,mBAAmB,mBA6BrC;CACH;AAED,cAAM,QAAS,SAAQ,+BAA+B;IACpD,KAAK,mEAAuC;IAC5C,KAAK,uCA8BH;CACH;AAED,cAAM,QAAS,SAAQ,+BAA+B;IACpD,KAAK,iEAAqC;IAC1C,KAAK;;;;OAA8C;IACnD,KAAK,iDAAuG;IAE5G,GAAG,UAAiB,mBAAmB,mBAsBrC;CACH;AAED,cAAM,cAAe,SAAQ,+BAA+B;IAC1D,KAAK,kEAAsC;IAC3C,KAAK,mCAIH;IAEF,GAAG,UAAiB,mBAAmB,mBAwBrC;CACH;AAED,qBAAa,UAAW,SAAQ,YAAY;IAC1C,QAAQ,mFAKN;CACH"}
+{"version":3,"file":"characteristics_fan.d.ts","sourceRoot":"","sources":["../src/characteristics_fan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,+BAA+B,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAqBvF,cAAM,SAAU,SAAQ,+BAA+B;IACrD,KAAK,0DAA8B;IACnC,GAAG,uBAwBD;IAEF,GAAG,GAAU,OAAO,mBAAmB,mBAoBrC;CACH;AAED,cAAM,QAAS,SAAQ,+BAA+B;IACpD,KAAK,mEAAuC;IAC5C,GAAG,2BAwBD;CACH;AAED,cAAM,QAAS,SAAQ,+BAA+B;IACpD,KAAK,iEAAqC;IAC1C,KAAK;;;;MAA0C;IAE/C,GAAG,qCAID;IAEF,GAAG,GAAU,OAAO,mBAAmB,mBAcrC;CACH;AAED,cAAM,cAAe,SAAQ,+BAA+B;IAC1D,KAAK,kEAAsC;IAE3C,GAAG,uBAOD;IAEF,GAAG,GAAU,OAAO,mBAAmB,mBAgBrC;CACH;AAED,qBAAa,UAAW,SAAQ,YAAY;IAC1C,QAAQ,mFAKN;CACH"}

package/dist/characteristics_fan.js

@@ -4,7 +4,6 @@ exports.FanService = void 0;
 const characteristics_base_1 = require("./characteristics_base");
 const helpers_1 = require("./helpers");
 const constants_1 = require("./api/constants");
-const rxjs_1 = require("rxjs");
 /*
  * Controls for system fan.
  *
@@ -25,48 +24,42 @@ class FanStatus extends characteristics_base_1.ThermostatCharacteristicWrapper {
     constructor() {
         super(...arguments);
         this.ctype = this.Characteristic.Active;
-        this.value = (0, rxjs_1.combineLatest)([
-            this.system.config.mode,
-            this.system.config.getZone(this.context.zone).fan,
-            this.system.status.getZone(this.context.zone).blowing,
-            this.system.status.getZone(this.context.zone).closed,
-        ]).pipe((0, rxjs_1.debounceTime)(50), (0, rxjs_1.map)(([c_mode, c_fan, s_blowing, s_closed]) => {
-            // First, we do the absolute checks. If the status says blowing, or the system
-            // is shut off, we know the state.
-            if (s_blowing) {
-                return this.Characteristic.Active.ACTIVE;
-            }
-            else if (c_mode === constants_1.SYSTEM_MODE.OFF) {
+        this.get = async () => {
+            if (
+            // if the system is configured to be off, the fan must be off
+            await this.system.config.getMode() === constants_1.SYSTEM_MODE.OFF) {
                 return this.Characteristic.Active.INACTIVE;
-                // Second, we check for the edge case between when a user changes the state
-                // and the system picks it up. If the fan is set to on, the fan will be on
-                // soon, even though it isn't yet (which we know since blowing was false).
-                // This mitigates switch instability.
-                // However, we only do this edge case fix if the damper status is not closed,
-                // since if the damper reports it is closed, there is a good chance the
-                // config may be ignored for one reason or another. (#156)
             }
-            else if (c_fan !== constants_1.FAN_MODE.OFF && !s_closed) {
-                return this.Characteristic.Active.ACTIVE;
+            else if (
+            // zone config api says manual fan mode
+            await this.system.config.getZoneActivityFan(this.context.zone, await this.getActivity()) !== constants_1.FAN_MODE.OFF ||
+                // zone status api says fan is on
+                await this.system.status.getZoneFan(this.context.zone) !== constants_1.FAN_MODE.OFF ||
+                // zone status api says zone is conditioning
+                await this.system.status.getZoneConditioning(this.context.zone) !== constants_1.SYSTEM_MODE.OFF) {
+                // but there is an exception to the above... which is the fan status/config
+                // can be wrong if the zone is actually closed off.
+                if (await this.system.status.getZoneOpen(this.context.zone)) {
+                    return this.Characteristic.Active.ACTIVE;
+                }
+                else {
+                    return this.Characteristic.Active.INACTIVE;
+                }
+            }
+            else {
+                return this.Characteristic.Active.INACTIVE;
             }
-            // Finally, if we get here the zone is not blowing.
-            return this.Characteristic.Active.INACTIVE;
-        }), (0, rxjs_1.distinctUntilChanged)());
+        };
         this.set = async (value) => {
             // if we are trying to *turn on* fan, and system is off, set to fan only mode
             if (value === this.Characteristic.Active.ACTIVE &&
-                await (0, rxjs_1.firstValueFrom)(this.system.config.mode) === constants_1.SYSTEM_MODE.OFF) {
+                await this.system.config.getMode() === constants_1.SYSTEM_MODE.OFF) {
                 return await this.system.config.setMode(constants_1.SYSTEM_MODE.FAN_ONLY);
             }
             // if we are trying to turn off fan, turn off fan override (i.e. set fan speed=auto)
             // NOTE: If system is in FAN_ONLY mode, it will remain in FAN ONLY, but with speed=auto.
             if (value === this.Characteristic.Active.INACTIVE) {
-                // Sync current activity settings to manual activity
-                await this.system.config.setZoneActivityManualSync(this.context.zone, await (0, rxjs_1.firstValueFrom)(this.system.getZoneActivity(this.context.zone)));
-                // Update manual activity fan speed
-                await this.system.config.setZoneActivityManualFan(this.context.zone, constants_1.FAN_MODE.OFF);
-                // Enable manual activity hold
-                await this.system.config.setZoneActivityHold(this.context.zone, constants_1.ACTIVITY.MANUAL, await this.getHoldTime());
+                return await this.system.config.setZoneActivityManualHold(this.context.zone, null, null, await this.getHoldTime(), constants_1.FAN_MODE.OFF);
             }
         };
     }
@@ -75,52 +68,49 @@ class FanState extends characteristics_base_1.ThermostatCharacteristicWrapper {
     constructor() {
         super(...arguments);
         this.ctype = this.Characteristic.CurrentFanState;
-        this.value = (0, rxjs_1.combineLatest)([
-            this.system.config.mode,
-            this.system.config.getZone(this.context.zone).fan,
-            this.system.status.getZone(this.context.zone).blowing,
-            this.system.status.getZone(this.context.zone).closed,
-        ]).pipe((0, rxjs_1.debounceTime)(50), (0, rxjs_1.map)(([c_mode, c_fan, s_blowing, s_closed]) => {
-            // First, we do the absolute checks. If the status says blowing, or the system
-            // is shut off, we know the state.
-            if (s_blowing) {
-                return this.Characteristic.CurrentFanState.BLOWING_AIR;
-            }
-            else if (c_mode === constants_1.SYSTEM_MODE.OFF) {
+        this.get = async () => {
+            if (
+            // if the system is configured to be off, the fan must be off
+            await this.system.config.getMode() === constants_1.SYSTEM_MODE.OFF) {
                 return this.Characteristic.CurrentFanState.INACTIVE;
-                // Second, we check for the edge case between when a user changes the state
-                // and the system picks it up. If the fan is set to on, the fan will be on
-                // soon, even though it isn't yet (which we know since blowing was false).
-                // This mitigates switch instability.
-                // However, we only do this edge case fix if the damper status is not closed,
-                // since if the damper reports it is closed, there is a good chance the
-                // config may be ignored for one reason or another. (#156)
             }
-            else if (c_fan !== constants_1.FAN_MODE.OFF && !s_closed) {
-                return this.Characteristic.CurrentFanState.BLOWING_AIR;
+            else if (
+            // zone config api says manual fan mode
+            await this.system.config.getZoneActivityFan(this.context.zone, await this.getActivity()) !== constants_1.FAN_MODE.OFF ||
+                // zone status api says fan is on
+                await this.system.status.getZoneFan(this.context.zone) !== constants_1.FAN_MODE.OFF ||
+                // zone status api says zone is conditioning
+                await this.system.status.getZoneConditioning(this.context.zone) !== constants_1.SYSTEM_MODE.OFF) {
+                // but there is an exception to the above... which is the fan status/config
+                // can be wrong if the zone is actually closed off.
+                if (await this.system.status.getZoneOpen(this.context.zone)) {
+                    return this.Characteristic.CurrentFanState.BLOWING_AIR;
+                }
+                else {
+                    return this.Characteristic.CurrentFanState.IDLE;
+                }
             }
-            // Finally, if we get here the zone is not blowing.
-            return this.Characteristic.CurrentFanState.IDLE;
-        }), (0, rxjs_1.distinctUntilChanged)());
+            else {
+                return this.Characteristic.CurrentFanState.IDLE;
+            }
+        };
     }
 }
 class FanSpeed extends characteristics_base_1.ThermostatCharacteristicWrapper {
     constructor() {
         super(...arguments);
         this.ctype = this.Characteristic.RotationSpeed;
-        this.props = (0, rxjs_1.of)({ minValue: 0, maxValue: 3, minStep: 1 });
-        this.value = this.system.config.getZone(this.context.zone).fan.pipe((0, rxjs_1.map)(data => (0, helpers_1.convertSystemFan2CharFan)(data)));
+        this.props = { minValue: 0, maxValue: 3, minStep: 1 };
+        this.get = async () => {
+            return (0, helpers_1.convertSystemFan2CharFan)(await this.system.config.getZoneActivityFan(this.context.zone, await this.getActivity()));
+        };
         this.set = async (value) => {
             // if we are trying to control fan, and system is off, set to fan only mode
-            if (await (0, rxjs_1.firstValueFrom)(this.system.config.mode) === constants_1.SYSTEM_MODE.OFF) {
+            if (await this.system.config.getMode() === constants_1.SYSTEM_MODE.OFF) {
                 await this.system.config.setMode(constants_1.SYSTEM_MODE.FAN_ONLY);
             }
-            // Sync current activity settings to manual activity
-            await this.system.config.setZoneActivityManualSync(this.context.zone, await (0, rxjs_1.firstValueFrom)(this.system.getZoneActivity(this.context.zone)));
-            // Update manual activity fan speed
-            await this.system.config.setZoneActivityManualFan(this.context.zone, (0, helpers_1.convertCharFan2SystemFan)(value));
-            // Enable manual activity hold
-            await this.system.config.setZoneActivityHold(this.context.zone, constants_1.ACTIVITY.MANUAL, await this.getHoldTime());
+            // set fan speed
+            return await this.system.config.setZoneActivityManualHold(this.context.zone, null, null, await this.getHoldTime(), (0, helpers_1.convertCharFan2SystemFan)(value));
         };
     }
 }
@@ -128,22 +118,20 @@ class TargetFanState extends characteristics_base_1.ThermostatCharacteristicWrap
     constructor() {
         super(...arguments);
         this.ctype = this.Characteristic.TargetFanState;
-        this.value = this.system.config.getZone(this.context.zone).fan.pipe((0, rxjs_1.map)(data => data === constants_1.FAN_MODE.OFF ?
-            this.Characteristic.TargetFanState.AUTO :
-            this.Characteristic.TargetFanState.MANUAL));
+        this.get = async () => {
+            return await this.system.config.getZoneActivityFan(this.context.zone, await this.getActivity()) === constants_1.FAN_MODE.OFF ?
+                this.Characteristic.TargetFanState.AUTO :
+                this.Characteristic.TargetFanState.MANUAL;
+        };
         this.set = async (value) => {
             // if we are trying to control fan, and system is off, set to fan only mode
-            if (await (0, rxjs_1.firstValueFrom)(this.system.config.mode) === constants_1.SYSTEM_MODE.OFF) {
+            if (await this.system.config.getMode() === constants_1.SYSTEM_MODE.OFF) {
                 await this.system.config.setMode(constants_1.SYSTEM_MODE.FAN_ONLY);
             }
-            // Sync current activity settings to manual activity
-            await this.system.config.setZoneActivityManualSync(this.context.zone, await (0, rxjs_1.firstValueFrom)(this.system.getZoneActivity(this.context.zone)));
-            // Update manual activity fan speed to switch between auto and manual
-            await this.system.config.setZoneActivityManualFan(this.context.zone, value === this.Characteristic.TargetFanState.AUTO ?
+            // set fan speed to switch between auto and manual
+            return await this.system.config.setZoneActivityManualHold(this.context.zone, null, null, await this.getHoldTime(), value === this.Characteristic.TargetFanState.AUTO ?
                 constants_1.FAN_MODE.OFF : // fan off is auto
                 constants_1.FAN_MODE.MED);
-            // Enable manual activity hold
-            await this.system.config.setZoneActivityHold(this.context.zone, constants_1.ACTIVITY.MANUAL, await this.getHoldTime());
         };
     }
 }

package/dist/characteristics_fan.js.map

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

package/dist/characteristics_filter.d.ts

@@ -1,7 +1,7 @@
 import { CharacteristicWrapper, MultiWrapper } from './characteristics_base';
 declare class FilterLife extends CharacteristicWrapper {
     ctype: typeof import("hap-nodejs/dist/lib/definitions").FilterLifeLevel;
-    value: import("rxjs").Observable<number>;
+    get: () => Promise<number>;
 }
 export declare class FilterService extends MultiWrapper {
     WRAPPERS: (typeof FilterLife)[];

package/dist/characteristics_filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"characteristics_filter.d.ts","sourceRoot":"","sources":["../src/characteristics_filter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE7E,cAAM,UAAW,SAAQ,qBAAqB;IAC5C,KAAK,mEAAuC;IAC5C,KAAK,oCAA0D;CAChE;AAWD,qBAAa,aAAc,SAAQ,YAAY;IAC7C,QAAQ,wBAGN;CACH"}
+{"version":3,"file":"characteristics_filter.d.ts","sourceRoot":"","sources":["../src/characteristics_filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE7E,cAAM,UAAW,SAAQ,qBAAqB;IAC5C,KAAK,mEAAuC;IAC5C,GAAG,wBAED;CACH;AAWD,qBAAa,aAAc,SAAQ,YAAY;IAC7C,QAAQ,wBAGN;CACH"}

package/dist/characteristics_filter.js

@@ -1,22 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilterService = void 0;
-const rxjs_1 = require("rxjs");
 const characteristics_base_1 = require("./characteristics_base");
 class FilterLife extends characteristics_base_1.CharacteristicWrapper {
     constructor() {
         super(...arguments);
         this.ctype = this.Characteristic.FilterLifeLevel;
-        this.value = this.system.status.filter_used.pipe((0, rxjs_1.map)(x => 100 - x));
+        this.get = async () => {
+            return 100 - (await this.system.status.getFilterUsed());
+        };
     }
 }
 class FilterChange extends characteristics_base_1.CharacteristicWrapper {
     constructor() {
         super(...arguments);
         this.ctype = this.Characteristic.FilterChangeIndication;
-        this.value = this.system.status.filter_used.pipe((0, rxjs_1.map)(x => x > 95 ?
-            this.Characteristic.FilterChangeIndication.CHANGE_FILTER :
-            this.Characteristic.FilterChangeIndication.FILTER_OK));
+        this.get = async () => {
+            return (await this.system.status.getFilterUsed()) > 95 ?
+                this.Characteristic.FilterChangeIndication.CHANGE_FILTER :
+                this.Characteristic.FilterChangeIndication.FILTER_OK;
+        };
     }
 }
 class FilterService extends characteristics_base_1.MultiWrapper {

package/dist/characteristics_filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"characteristics_filter.js","sourceRoot":"","sources":["../src/characteristics_filter.ts"],"names":[],"mappings":";;;AAAA,+BAA2B;AAC3B,iEAA6E;AAE7E,MAAM,UAAW,SAAQ,4CAAqB;IAA9C;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC;QAC5C,UAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAA,UAAG,EAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACjE,CAAC;CAAA;AAED,MAAM,YAAa,SAAQ,4CAAqB;IAAhD;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC;QACnD,UAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAA,UAAG,EAC7C,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;YACX,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC;YAC1D,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,SAAS,CACvD,CAAC,CAAC;IACL,CAAC;CAAA;AAED,MAAa,aAAc,SAAQ,mCAAY;IAA/C;;QACE,aAAQ,GAAG;YACT,UAAU;YACV,YAAY;SACb,CAAC;IACJ,CAAC;CAAA;AALD,sCAKC"}
+{"version":3,"file":"characteristics_filter.js","sourceRoot":"","sources":["../src/characteristics_filter.ts"],"names":[],"mappings":";;;AAAA,iEAA6E;AAE7E,MAAM,UAAW,SAAQ,4CAAqB;IAA9C;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC;QAC5C,QAAG,GAAG,KAAK,IAAI,EAAE;YACf,OAAO,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC;QAC1D,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,MAAM,YAAa,SAAQ,4CAAqB;IAAhD;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC;QACnD,QAAG,GAAG,KAAK,IAAI,EAAE;YACf,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;gBACtD,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC;gBAC1D,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,SAAS,CAAC;QACzD,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,MAAa,aAAc,SAAQ,mCAAY;IAA/C;;QACE,aAAQ,GAAG;YACT,UAAU;YACV,YAAY;SACb,CAAC;IACJ,CAAC;CAAA;AALD,sCAKC"}

package/dist/characteristics_humidity.d.ts

@@ -1,13 +1,16 @@
 import { CharacteristicWrapper, MultiWrapper } from './characteristics_base';
 declare class CurrentRH extends CharacteristicWrapper {
     ctype: typeof import("hap-nodejs/dist/lib/definitions").CurrentRelativeHumidity;
-    value: import("rxjs").Observable<number>;
+    get: () => Promise<number>;
+}
+declare class TargetDehumidify extends CharacteristicWrapper {
+    ctype: typeof import("hap-nodejs/dist/lib/definitions").RelativeHumidityDehumidifierThreshold;
 }
 export declare class ThermostatRHService extends MultiWrapper {
     WRAPPERS: (typeof CurrentRH)[];
 }
 export declare class HumidifierService extends MultiWrapper {
-    WRAPPERS: (typeof CurrentRH)[];
+    WRAPPERS: (typeof TargetDehumidify)[];
 }
 export {};
 //# sourceMappingURL=characteristics_humidity.d.ts.map

package/dist/characteristics_humidity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"characteristics_humidity.d.ts","sourceRoot":"","sources":["../src/characteristics_humidity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE7E,cAAM,SAAU,SAAQ,qBAAqB;IAC3C,KAAK,2EAA+C;IACpD,KAAK,oCAA0D;CAChE;AAWD,qBAAa,mBAAoB,SAAQ,YAAY;IACnD,QAAQ,uBAEN;CACH;AAED,qBAAa,iBAAkB,SAAQ,YAAY;IACjD,QAAQ,uBAIN;CACH"}
+{"version":3,"file":"characteristics_humidity.d.ts","sourceRoot":"","sources":["../src/characteristics_humidity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE7E,cAAM,SAAU,SAAQ,qBAAqB;IAC3C,KAAK,2EAA+C;IACpD,GAAG,wBAED;CACH;AAED,cAAM,gBAAiB,SAAQ,qBAAqB;IAClD,KAAK,yFAA6D;CACnE;AAOD,qBAAa,mBAAoB,SAAQ,YAAY;IACnD,QAAQ,uBAEN;CACH;AAED,qBAAa,iBAAkB,SAAQ,YAAY;IACjD,QAAQ,8BAIN;CACH"}

package/dist/characteristics_humidity.js

@@ -6,15 +6,23 @@ class CurrentRH extends characteristics_base_1.CharacteristicWrapper {
     constructor() {
         super(...arguments);
         this.ctype = this.Characteristic.CurrentRelativeHumidity;
-        this.value = this.system.status.getZone(this.context.zone).humidity;
+        this.get = async () => {
+            return await this.system.status.getZoneHumidity(this.context.zone);
+        };
+    }
+}
+class TargetDehumidify extends characteristics_base_1.CharacteristicWrapper {
+    constructor() {
+        super(...arguments);
+        this.ctype = this.Characteristic.RelativeHumidityDehumidifierThreshold;
+    }
+}
+class TargetHumidify extends characteristics_base_1.CharacteristicWrapper {
+    constructor() {
+        super(...arguments);
+        this.ctype = this.Characteristic.RelativeHumidityHumidifierThreshold;
     }
 }
-// class TargetDehumidify extends CharacteristicWrapper {
-//   ctype = this.Characteristic.RelativeHumidityDehumidifierThreshold;
-// }
-// class TargetHumidify extends CharacteristicWrapper {
-//   ctype = this.Characteristic.RelativeHumidityHumidifierThreshold;
-// }
 class ThermostatRHService extends characteristics_base_1.MultiWrapper {
     constructor() {
         super(...arguments);
@@ -29,8 +37,8 @@ class HumidifierService extends characteristics_base_1.MultiWrapper {
         super(...arguments);
         this.WRAPPERS = [
             CurrentRH,
-            // TargetDehumidify,
-            // TargetHumidify,
+            TargetDehumidify,
+            TargetHumidify,
         ];
     }
 }

package/dist/characteristics_humidity.js.map

@@ -1 +1 @@
-{"version":3,"file":"characteristics_humidity.js","sourceRoot":"","sources":["../src/characteristics_humidity.ts"],"names":[],"mappings":";;;AAAA,iEAA6E;AAE7E,MAAM,SAAU,SAAQ,4CAAqB;IAA7C;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC;QACpD,UAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IACjE,CAAC;CAAA;AAED,yDAAyD;AACzD,uEAAuE;AACvE,IAAI;AAEJ,uDAAuD;AACvD,qEAAqE;AACrE,IAAI;AAGJ,MAAa,mBAAoB,SAAQ,mCAAY;IAArD;;QACE,aAAQ,GAAG;YACT,SAAS;SACV,CAAC;IACJ,CAAC;CAAA;AAJD,kDAIC;AAED,MAAa,iBAAkB,SAAQ,mCAAY;IAAnD;;QACE,aAAQ,GAAG;YACT,SAAS;YACT,oBAAoB;YACpB,kBAAkB;SACnB,CAAC;IACJ,CAAC;CAAA;AAND,8CAMC"}
+{"version":3,"file":"characteristics_humidity.js","sourceRoot":"","sources":["../src/characteristics_humidity.ts"],"names":[],"mappings":";;;AAAA,iEAA6E;AAE7E,MAAM,SAAU,SAAQ,4CAAqB;IAA7C;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC;QACpD,QAAG,GAAG,KAAK,IAAI,EAAE;YACf,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACrE,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,MAAM,gBAAiB,SAAQ,4CAAqB;IAApD;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,qCAAqC,CAAC;IACpE,CAAC;CAAA;AAED,MAAM,cAAe,SAAQ,4CAAqB;IAAlD;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,mCAAmC,CAAC;IAClE,CAAC;CAAA;AAGD,MAAa,mBAAoB,SAAQ,mCAAY;IAArD;;QACE,aAAQ,GAAG;YACT,SAAS;SACV,CAAC;IACJ,CAAC;CAAA;AAJD,kDAIC;AAED,MAAa,iBAAkB,SAAQ,mCAAY;IAAnD;;QACE,aAAQ,GAAG;YACT,SAAS;YACT,gBAAgB;YAChB,cAAc;SACf,CAAC;IACJ,CAAC;CAAA;AAND,8CAMC"}

package/dist/helper_logging.d.ts

@@ -4,6 +4,7 @@ export declare class PrefixLogger implements Logger {
     readonly prefix: string;
     constructor(internal: Logger, prefix: string);
     info(message: string, ...parameters: any[]): void;
+    success(message: string, ...parameters: any[]): void;
     warn(message: string, ...parameters: any[]): void;
     error(message: string, ...parameters: any[]): void;
     debug(message: string, ...parameters: any[]): void;

package/dist/helper_logging.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helper_logging.d.ts","sourceRoot":"","sources":["../src/helper_logging.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE9C,qBAAa,YAAa,YAAW,MAAM;IAEnC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM;gBADN,QAAQ,EAAE,MAAM,EACxB,MAAM,EAAE,MAAM;IAGtB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE,GAAG,EAAE,GAAG,IAAI;IAIjD,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE,GAAG,EAAE,GAAG,IAAI;IAIjD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE,GAAG,EAAE,GAAG,IAAI;IAIlD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE,GAAG,EAAE,GAAG,IAAI;IAIlD,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE,GAAG,EAAE,GAAG,IAAI;CAGzE"}
+{"version":3,"file":"helper_logging.d.ts","sourceRoot":"","sources":["../src/helper_logging.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE9C,qBAAa,YAAa,YAAW,MAAM;IAEnC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM;gBADN,QAAQ,EAAE,MAAM,EACxB,MAAM,EAAE,MAAM;IAGtB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE,GAAG,EAAE,GAAG,IAAI;IAIjD,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE,GAAG,EAAE,GAAG,IAAI;IAIpD,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE,GAAG,EAAE,GAAG,IAAI;IAIjD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE,GAAG,EAAE,GAAG,IAAI;IAIlD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE,GAAG,EAAE,GAAG,IAAI;IAIlD,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE,GAAG,EAAE,GAAG,IAAI;CAGzE"}

package/dist/helper_logging.js

@@ -9,6 +9,9 @@ class PrefixLogger {
     info(message, ...parameters) {
         this.log("info" /* LogLevel.INFO */, message, ...parameters);
     }
+    success(message, ...parameters) {
+        this.log("success" /* LogLevel.SUCCESS */, message, ...parameters);
+    }
     warn(message, ...parameters) {
         this.log("warn" /* LogLevel.WARN */, message, ...parameters);
     }

package/dist/helper_logging.js.map

@@ -1 +1 @@
-{"version":3,"file":"helper_logging.js","sourceRoot":"","sources":["../src/helper_logging.ts"],"names":[],"mappings":";;;AAGA,MAAa,YAAY;IACvB,YACuB,QAAgB,EACxB,MAAc;QADN,aAAQ,GAAR,QAAQ,CAAQ;QACxB,WAAM,GAAN,MAAM,CAAQ;IAC3B,CAAC;IAEI,IAAI,CAAC,OAAe,EAAE,GAAG,UAAiB;QAC/C,IAAI,CAAC,GAAG,6BAAgB,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC;IAClD,CAAC;IAEM,IAAI,CAAC,OAAe,EAAE,GAAG,UAAiB;QAC/C,IAAI,CAAC,GAAG,6BAAgB,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC;IAClD,CAAC;IAEM,KAAK,CAAC,OAAe,EAAE,GAAG,UAAiB;QAChD,IAAI,CAAC,GAAG,+BAAiB,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC;IACnD,CAAC;IAEM,KAAK,CAAC,OAAe,EAAE,GAAG,UAAiB;QAChD,IAAI,CAAC,GAAG,+BAAiB,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC;IACnD,CAAC;IAEM,GAAG,CAAC,KAAe,EAAE,OAAe,EAAE,GAAG,UAAiB;QAC/D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,EAAE,EAAE,GAAG,UAAU,CAAC,CAAC;IACzE,CAAC;CACF;AAzBD,oCAyBC"}
+{"version":3,"file":"helper_logging.js","sourceRoot":"","sources":["../src/helper_logging.ts"],"names":[],"mappings":";;;AAGA,MAAa,YAAY;IACvB,YACuB,QAAgB,EACxB,MAAc;QADN,aAAQ,GAAR,QAAQ,CAAQ;QACxB,WAAM,GAAN,MAAM,CAAQ;IAC3B,CAAC;IAEI,IAAI,CAAC,OAAe,EAAE,GAAG,UAAiB;QAC/C,IAAI,CAAC,GAAG,6BAAgB,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC;IAClD,CAAC;IAEM,OAAO,CAAC,OAAe,EAAE,GAAG,UAAiB;QAClD,IAAI,CAAC,GAAG,mCAAmB,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC;IACrD,CAAC;IAEM,IAAI,CAAC,OAAe,EAAE,GAAG,UAAiB;QAC/C,IAAI,CAAC,GAAG,6BAAgB,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC;IAClD,CAAC;IAEM,KAAK,CAAC,OAAe,EAAE,GAAG,UAAiB;QAChD,IAAI,CAAC,GAAG,+BAAiB,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC;IACnD,CAAC;IAEM,KAAK,CAAC,OAAe,EAAE,GAAG,UAAiB;QAChD,IAAI,CAAC,GAAG,+BAAiB,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC;IACnD,CAAC;IAEM,GAAG,CAAC,KAAe,EAAE,OAAe,EAAE,GAAG,UAAiB;QAC/D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,EAAE,EAAE,GAAG,UAAU,CAAC,CAAC;IACzE,CAAC;CACF;AA7BD,oCA6BC"}