homebridge-carrier-infinity 1.6.1 → 1.6.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/accessory_base.d.ts +5 -2
- package/dist/accessory_base.d.ts.map +1 -1
- package/dist/accessory_base.js +6 -3
- package/dist/accessory_base.js.map +1 -1
- package/dist/accessory_comfort_activity.js +5 -5
- package/dist/accessory_comfort_activity.js.map +1 -1
- package/dist/accessory_envsensor.js +2 -2
- package/dist/accessory_envsensor.js.map +1 -1
- package/dist/accessory_oat.d.ts +1 -1
- package/dist/accessory_oat.d.ts.map +1 -1
- package/dist/accessory_oat.js +4 -4
- package/dist/accessory_oat.js.map +1 -1
- package/dist/accessory_thermostat.d.ts.map +1 -1
- package/dist/accessory_thermostat.js +3 -4
- package/dist/accessory_thermostat.js.map +1 -1
- package/dist/characteristics_ac.d.ts +1 -1
- package/dist/characteristics_ac.d.ts.map +1 -1
- package/dist/characteristics_ac.js +15 -14
- package/dist/characteristics_ac.js.map +1 -1
- package/dist/{base.d.ts → characteristics_base.d.ts} +1 -2
- package/dist/{base.d.ts.map → characteristics_base.d.ts.map} +1 -1
- package/dist/{base.js → characteristics_base.js} +3 -3
- package/dist/characteristics_base.js.map +1 -0
- package/dist/characteristics_fan.d.ts +1 -1
- package/dist/characteristics_fan.d.ts.map +1 -1
- package/dist/characteristics_fan.js +6 -6
- package/dist/characteristics_fan.js.map +1 -1
- package/dist/characteristics_filter.d.ts +1 -1
- package/dist/characteristics_filter.d.ts.map +1 -1
- package/dist/characteristics_filter.js +4 -4
- package/dist/characteristics_filter.js.map +1 -1
- package/dist/characteristics_humidity.d.ts +1 -1
- package/dist/characteristics_humidity.d.ts.map +1 -1
- package/dist/characteristics_humidity.js +6 -6
- package/dist/characteristics_humidity.js.map +1 -1
- package/dist/helper_logging.d.ts +12 -0
- package/dist/helper_logging.d.ts.map +1 -0
- package/dist/helper_logging.js +26 -0
- package/dist/helper_logging.js.map +1 -0
- package/dist/infinityApi.d.ts +4 -1
- package/dist/infinityApi.d.ts.map +1 -1
- package/dist/infinityApi.js +21 -16
- package/dist/infinityApi.js.map +1 -1
- package/dist/platform.js +4 -4
- package/dist/platform.js.map +1 -1
- package/package.json +1 -1
- package/dist/base.js.map +0 -1
package/dist/accessory_base.d.ts
CHANGED
|
@@ -1,9 +1,12 @@
|
|
|
1
|
-
import { PlatformAccessory, Service, WithUUID } from 'homebridge';
|
|
1
|
+
import { Logger, PlatformAccessory, Service, WithUUID } from 'homebridge';
|
|
2
|
+
import { InfinityEvolutionSystemModel } from './infinityApi';
|
|
2
3
|
import { CarrierInfinityHomebridgePlatform } from './platform';
|
|
3
4
|
export declare abstract class BaseAccessory {
|
|
4
5
|
protected readonly platform: CarrierInfinityHomebridgePlatform;
|
|
6
|
+
protected readonly context: Record<string, string>;
|
|
5
7
|
readonly accessory: PlatformAccessory;
|
|
6
|
-
readonly
|
|
8
|
+
protected readonly system: InfinityEvolutionSystemModel;
|
|
9
|
+
protected readonly log: Logger;
|
|
7
10
|
constructor(platform: CarrierInfinityHomebridgePlatform, context: Record<string, string>);
|
|
8
11
|
protected abstract ID(context: Record<string, string>): string;
|
|
9
12
|
protected useService(type: WithUUID<typeof Service>, name: string, sub_type?: string): Service;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessory_base.d.ts","sourceRoot":"","sources":["../src/accessory_base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"accessory_base.d.ts","sourceRoot":"","sources":["../src/accessory_base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE1E,OAAO,EAAE,4BAA4B,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAG/D,8BAAsB,aAAa;IAM/B,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,iCAAiC;IAC9D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IANpD,SAAgB,SAAS,EAAE,iBAAiB,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,4BAA4B,CAAoD;IAC3G,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAwD;gBAGjE,QAAQ,EAAE,iCAAiC,EAC3C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAkBpD,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;IAE9D,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO;CAW/F"}
|
package/dist/accessory_base.js
CHANGED
|
@@ -1,21 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BaseAccessory = void 0;
|
|
4
|
+
const helper_logging_1 = require("./helper_logging");
|
|
4
5
|
const settings_1 = require("./settings");
|
|
5
6
|
class BaseAccessory {
|
|
6
7
|
constructor(platform, context) {
|
|
7
8
|
this.platform = platform;
|
|
8
|
-
this.
|
|
9
|
+
this.context = context;
|
|
10
|
+
this.system = this.platform.systems[this.context.serialNumber];
|
|
11
|
+
this.log = new helper_logging_1.PrefixLogger(this.system.log, this.context.name);
|
|
9
12
|
const uuid = this.platform.api.hap.uuid.generate(this.ID(context));
|
|
10
13
|
let accessory = this.platform.restored_accessories[uuid];
|
|
11
14
|
if (!accessory) {
|
|
12
|
-
this.
|
|
15
|
+
this.log.info('Added');
|
|
13
16
|
accessory = new this.platform.api.platformAccessory(context.name, uuid);
|
|
14
17
|
accessory.context = context;
|
|
15
18
|
this.platform.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
|
|
16
19
|
}
|
|
17
20
|
else {
|
|
18
|
-
this.
|
|
21
|
+
this.log.info('Loaded');
|
|
19
22
|
accessory.context = context;
|
|
20
23
|
this.platform.api.updatePlatformAccessories([accessory]);
|
|
21
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessory_base.js","sourceRoot":"","sources":["../src/accessory_base.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"accessory_base.js","sourceRoot":"","sources":["../src/accessory_base.ts"],"names":[],"mappings":";;;AACA,qDAAgD;AAGhD,yCAAwD;AAExD,MAAsB,aAAa;IAKjC,YACqB,QAA2C,EAC3C,OAA+B;QAD/B,aAAQ,GAAR,QAAQ,CAAmC;QAC3C,YAAO,GAAP,OAAO,CAAwB;QALjC,WAAM,GAAiC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACxF,QAAG,GAAW,IAAI,6BAAY,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAMpF,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;QACnE,IAAI,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QACzD,IAAI,CAAC,SAAS,EAAE;YACd,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACvB,SAAS,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACxE,SAAS,CAAC,OAAO,GAAG,OAAO,CAAC;YAC5B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,2BAA2B,CAAC,sBAAW,EAAE,wBAAa,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;SACxF;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACxB,SAAS,CAAC,OAAO,GAAG,OAAO,CAAC;YAC5B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;SAC1D;QACD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACzC,CAAC;IAIS,UAAU,CAAC,IAA8B,EAAE,IAAY,EAAE,QAAiB;QAClF,+BAA+B;QAC/B,IAAI,OAA4B,CAAC;QACjC,IAAI,QAAQ,EAAE;YACZ,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;SACzD;aAAM;YACL,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SAC3C;QACD,2BAA2B;QAC3B,OAAO,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IACpE,CAAC;CACF;AAtCD,sCAsCC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ComfortActivityAccessory = void 0;
|
|
4
|
-
const
|
|
4
|
+
const characteristics_base_1 = require("./characteristics_base");
|
|
5
5
|
const accessory_base_1 = require("./accessory_base");
|
|
6
6
|
const infinityApi_1 = require("./infinityApi");
|
|
7
|
-
class Activity extends
|
|
7
|
+
class Activity extends characteristics_base_1.ThermostatCharacteristicWrapper {
|
|
8
8
|
constructor(platform, context, activity_name) {
|
|
9
9
|
super(platform, context);
|
|
10
10
|
this.platform = platform;
|
|
@@ -18,7 +18,7 @@ class Activity extends base_1.ThermostatCharacteristicWrapper {
|
|
|
18
18
|
// Turning off an activity is only allowed for the active activity
|
|
19
19
|
// (otherwise an off on one activity could remove a hold of another)
|
|
20
20
|
if (!value && await this.getActivity() !== this.activity_name) {
|
|
21
|
-
|
|
21
|
+
throw new this.platform.api.hap.HapStatusError(-70412 /* this.platform.api.hap.HAPStatus.NOT_ALLOWED_IN_CURRENT_STATE */);
|
|
22
22
|
}
|
|
23
23
|
return await this.system.config.setZoneActivityHold(this.context.zone,
|
|
24
24
|
// Turning on sets activity, turning off removes hold
|
|
@@ -31,7 +31,7 @@ class Activity extends base_1.ThermostatCharacteristicWrapper {
|
|
|
31
31
|
// psudo-activity. To match thermostat behavior, you can't switch directly to
|
|
32
32
|
// the manual activity. Instead activating this switch turns on a hold for the
|
|
33
33
|
// current activity. To hold to the manual activity, just change the temp.
|
|
34
|
-
class HoldActivity extends
|
|
34
|
+
class HoldActivity extends characteristics_base_1.ThermostatCharacteristicWrapper {
|
|
35
35
|
constructor() {
|
|
36
36
|
super(...arguments);
|
|
37
37
|
this.ctype = this.Characteristic.On;
|
|
@@ -62,7 +62,7 @@ class ComfortActivityAccessory extends accessory_base_1.BaseAccessory {
|
|
|
62
62
|
].forEach((activity) => {
|
|
63
63
|
new Activity(this.platform, this.accessory.context, activity).wrap(this.useService(this.platform.Service.Switch, `${activity[0].toUpperCase()}${activity.slice(1)}`, activity));
|
|
64
64
|
});
|
|
65
|
-
new
|
|
65
|
+
new characteristics_base_1.AccessoryInformation(this.platform, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.AccessoryInformation) ||
|
|
66
66
|
this.accessory.addService(this.platform.Service.AccessoryInformation));
|
|
67
67
|
}
|
|
68
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessory_comfort_activity.js","sourceRoot":"","sources":["../src/accessory_comfort_activity.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"accessory_comfort_activity.js","sourceRoot":"","sources":["../src/accessory_comfort_activity.ts"],"names":[],"mappings":";;;AACA,iEAA+F;AAC/F,qDAAiD;AACjD,+CAAiD;AAGjD,MAAM,QAAS,SAAQ,sDAA+B;IAGpD,YACkB,QAA2C,EACxC,OAAuB,EACvB,aAAqB;QAExC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAJT,aAAQ,GAAR,QAAQ,CAAmC;QACxC,YAAO,GAAP,OAAO,CAAgB;QACvB,kBAAa,GAAb,aAAa,CAAQ;QAL1C,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;QAU/B,QAAG,GAAG,KAAK,IAAI,EAAE;YACf,OAAO,CACL,MAAM,IAAI,CAAC,WAAW,EAAE,CACzB,KAAK,IAAI,CAAC,aAAa,CAAC;QAC3B,CAAC,CAAC;QAEF,QAAG,GAAG,KAAK,EAAE,KAA0B,EAAE,EAAE;YACzC,kEAAkE;YAClE,oEAAoE;YACpE,IAAI,CAAC,KAAK,IAAI,MAAM,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,aAAa,EAAE;gBAC7D,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,2EAA8D,CAAC;aAC9G;YAED,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,mBAAmB,CACjD,IAAI,CAAC,OAAO,CAAC,IAAI;YACjB,qDAAqD;YACrD,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,EAC/B,MAAM,IAAI,CAAC,WAAW,EAAE,CACzB,CAAC;QACJ,CAAC,CAAC;IArBF,CAAC;CAsBF;AAED,yEAAyE;AACzE,kEAAkE;AAClE,6EAA6E;AAC7E,8EAA8E;AAC9E,0EAA0E;AAC1E,MAAM,YAAa,SAAQ,sDAA+B;IAA1D;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;QAE/B,QAAG,GAAG,KAAK,IAAI,EAAE;YACf,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC3E,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,oBAAM,CAAC,EAAE,CAAC;QAC/B,CAAC,CAAC;QAEF,QAAG,GAAG,KAAK,EAAE,KAA0B,EAAE,EAAE;YACzC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,mBAAmB,CACjD,IAAI,CAAC,OAAO,CAAC,IAAI;YACjB,0EAA0E;YAC1E,KAAK,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,EACrC,MAAM,IAAI,CAAC,WAAW,EAAE,CACzB,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,MAAa,wBAAyB,SAAQ,8BAAa;IAE/C,EAAE,CAAC,OAA+B;QAC1C,OAAO,mBAAmB,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IACnE,CAAC;IAED,YACE,QAA2C,EAC3C,OAA+B;QAE/B,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAEzB,mEAAmE;QACnE,IAAI,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,CAC1D,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAC5B,aAAa,EACb,MAAM,CACP,CACF,CAAC;QAEF;YACE,sBAAQ,CAAC,IAAI;YACb,sBAAQ,CAAC,IAAI;YACb,sBAAQ,CAAC,IAAI;YACb,sBAAQ,CAAC,KAAK;SACf,CAAC,OAAO,CACP,CAAC,QAAQ,EAAE,EAAE;YACX,IAAI,QAAQ,CACV,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,SAAS,CAAC,OAAO,EACtB,QAAQ,CACT,CAAC,IAAI,CACJ,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAC5B,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAClD,QAAQ,CACT,CACF,CAAC;QACJ,CAAC,CACF,CAAC;QAEF,IAAI,2CAAoB,CACtB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,SAAS,CAAC,OAAO,CACvB,CAAC,IAAI,CACJ,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC;YACrE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,CACtE,CAAC;IAEJ,CAAC;CACF;AAnDD,4DAmDC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EnvSensorAccessory = void 0;
|
|
4
|
-
const
|
|
4
|
+
const characteristics_base_1 = require("./characteristics_base");
|
|
5
5
|
const characteristics_humidity_1 = require("./characteristics_humidity");
|
|
6
6
|
const accessory_base_1 = require("./accessory_base");
|
|
7
7
|
class EnvSensorAccessory extends accessory_base_1.BaseAccessory {
|
|
@@ -12,7 +12,7 @@ class EnvSensorAccessory extends accessory_base_1.BaseAccessory {
|
|
|
12
12
|
super(platform, context);
|
|
13
13
|
new characteristics_humidity_1.ThermostatRHService(this.platform, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.HumiditySensor) ||
|
|
14
14
|
this.accessory.addService(this.platform.Service.HumiditySensor));
|
|
15
|
-
new
|
|
15
|
+
new characteristics_base_1.AccessoryInformation(this.platform, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.AccessoryInformation) ||
|
|
16
16
|
this.accessory.addService(this.platform.Service.AccessoryInformation));
|
|
17
17
|
}
|
|
18
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessory_envsensor.js","sourceRoot":"","sources":["../src/accessory_envsensor.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"accessory_envsensor.js","sourceRoot":"","sources":["../src/accessory_envsensor.ts"],"names":[],"mappings":";;;AACA,iEAA8D;AAC9D,yEAAiE;AACjE,qDAAiD;AAEjD,MAAa,kBAAmB,SAAQ,8BAAa;IACzC,EAAE,CAAC,OAA+B;QAC1C,OAAO,aAAa,OAAO,CAAC,YAAY,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC;IACvE,CAAC;IAED,YACE,QAA2C,EAC3C,OAA+B;QAE/B,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAEzB,IAAI,8CAAmB,CACrB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,SAAS,CAAC,OAAO,CACvB,CAAC,IAAI,CACJ,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC;YAC/D,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAChE,CAAC;QAEF,IAAI,2CAAoB,CACtB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,SAAS,CAAC,OAAO,CACvB,CAAC,IAAI,CACJ,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC;YACrE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,CACtE,CAAC;IAEJ,CAAC;CACF;AA5BD,gDA4BC"}
|
package/dist/accessory_oat.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CarrierInfinityHomebridgePlatform } from './platform';
|
|
2
|
-
import { CharacteristicWrapper, MultiWrapper } from './
|
|
2
|
+
import { CharacteristicWrapper, MultiWrapper } from './characteristics_base';
|
|
3
3
|
import { BaseAccessory } from './accessory_base';
|
|
4
4
|
declare class OATSensorTemp extends CharacteristicWrapper {
|
|
5
5
|
ctype: typeof import("hap-nodejs/dist/lib/definitions").CurrentTemperature;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessory_oat.d.ts","sourceRoot":"","sources":["../src/accessory_oat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAwB,qBAAqB,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"accessory_oat.d.ts","sourceRoot":"","sources":["../src/accessory_oat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAwB,qBAAqB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEnG,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,cAAM,aAAc,SAAQ,qBAAqB;IAC/C,KAAK,sEAA0C;IAC/C,GAAG,0DAKD;CACH;AAED,qBAAa,wBAAyB,SAAQ,YAAY;IACxD,QAAQ,2BAAmB;CAC5B;AAED,qBAAa,2BAA4B,SAAQ,aAAa;IAE5D,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;gBAKnD,QAAQ,EAAE,iCAAiC,EAC3C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;CAqBlC"}
|
package/dist/accessory_oat.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.OutdoorTemperatureAccessory = exports.OutdoorTempSensorService = void 0;
|
|
4
|
-
const
|
|
4
|
+
const characteristics_base_1 = require("./characteristics_base");
|
|
5
5
|
const helpers_1 = require("./helpers");
|
|
6
6
|
const accessory_base_1 = require("./accessory_base");
|
|
7
|
-
class OATSensorTemp extends
|
|
7
|
+
class OATSensorTemp extends characteristics_base_1.CharacteristicWrapper {
|
|
8
8
|
constructor() {
|
|
9
9
|
super(...arguments);
|
|
10
10
|
this.ctype = this.Characteristic.CurrentTemperature;
|
|
@@ -13,7 +13,7 @@ class OATSensorTemp extends base_1.CharacteristicWrapper {
|
|
|
13
13
|
};
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
|
-
class OutdoorTempSensorService extends
|
|
16
|
+
class OutdoorTempSensorService extends characteristics_base_1.MultiWrapper {
|
|
17
17
|
constructor() {
|
|
18
18
|
super(...arguments);
|
|
19
19
|
this.WRAPPERS = [OATSensorTemp];
|
|
@@ -28,7 +28,7 @@ class OutdoorTemperatureAccessory extends accessory_base_1.BaseAccessory {
|
|
|
28
28
|
super(platform, context);
|
|
29
29
|
new OutdoorTempSensorService(this.platform, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.TemperatureSensor) ||
|
|
30
30
|
this.accessory.addService(this.platform.Service.TemperatureSensor));
|
|
31
|
-
new
|
|
31
|
+
new characteristics_base_1.AccessoryInformation(this.platform, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.AccessoryInformation) ||
|
|
32
32
|
this.accessory.addService(this.platform.Service.AccessoryInformation));
|
|
33
33
|
}
|
|
34
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessory_oat.js","sourceRoot":"","sources":["../src/accessory_oat.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"accessory_oat.js","sourceRoot":"","sources":["../src/accessory_oat.ts"],"names":[],"mappings":";;;AACA,iEAAmG;AACnG,uCAAuD;AACvD,qDAAiD;AAEjD,MAAM,aAAc,SAAQ,4CAAqB;IAAjD;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC;QAC/C,QAAG,GAAG,KAAK,IAAI,EAAE;YACf,OAAO,IAAA,oCAA0B,EAC/B,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,EACzC,GAAG,CACJ,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,MAAa,wBAAyB,SAAQ,mCAAY;IAA1D;;QACE,aAAQ,GAAG,CAAC,aAAa,CAAC,CAAC;IAC7B,CAAC;CAAA;AAFD,4DAEC;AAED,MAAa,2BAA4B,SAAQ,8BAAa;IAElD,EAAE,CAAC,OAA+B;QAC1C,OAAO,OAAO,OAAO,CAAC,YAAY,EAAE,CAAC;IACvC,CAAC;IAED,YACE,QAA2C,EAC3C,OAA+B;QAE/B,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAEzB,IAAI,wBAAwB,CAC1B,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,SAAS,CAAC,OAAO,CACvB,CAAC,IAAI,CACJ,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC;YAClE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,CACnE,CAAC;QAEF,IAAI,2CAAoB,CACtB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,SAAS,CAAC,OAAO,CACvB,CAAC,IAAI,CACJ,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC;YACrE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,CACtE,CAAC;IAEJ,CAAC;CACF;AA7BD,kEA6BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessory_thermostat.d.ts","sourceRoot":"","sources":["../src/accessory_thermostat.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAc/D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,qBAAa,mBAAoB,SAAQ,aAAa;IACpD,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,WAAW,CAAC,CAAU;IAC9B,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,cAAc,CAAiC;IAEvD,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;gBAKnD,QAAQ,EAAE,iCAAiC,EAC3C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"accessory_thermostat.d.ts","sourceRoot":"","sources":["../src/accessory_thermostat.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAc/D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,qBAAa,mBAAoB,SAAQ,aAAa;IACpD,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,WAAW,CAAC,CAAU;IAC9B,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,cAAc,CAAiC;IAEvD,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;gBAKnD,QAAQ,EAAE,iCAAiC,EAC3C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IA8DjC,eAAe,IAAI,IAAI;CAexB"}
|
|
@@ -10,15 +10,14 @@ const accessory_base_1 = require("./accessory_base");
|
|
|
10
10
|
class ThermostatAccessory extends accessory_base_1.BaseAccessory {
|
|
11
11
|
constructor(platform, context) {
|
|
12
12
|
super(platform, context);
|
|
13
|
-
const system = this.platform.systems[this.accessory.context.serialNumber];
|
|
14
13
|
// Create services
|
|
15
14
|
this.accessory.getService(this.platform.Service.AccessoryInformation)
|
|
16
15
|
.setCharacteristic(this.platform.Characteristic.SerialNumber, this.accessory.context.serialNumber);
|
|
17
16
|
this.service = this.accessory.getService(this.platform.Service.Thermostat) || this.accessory.addService(this.platform.Service.Thermostat);
|
|
18
17
|
// Create accessory api bridge
|
|
19
|
-
this.system_status = system.status;
|
|
18
|
+
this.system_status = this.system.status;
|
|
20
19
|
this.system_status.fetch().then();
|
|
21
|
-
this.system_config = system.config;
|
|
20
|
+
this.system_config = this.system.config;
|
|
22
21
|
this.system_config.fetch().then(async () => {
|
|
23
22
|
this.service.setCharacteristic(this.platform.Characteristic.Name, await this.system_config.getZoneName(this.accessory.context.zone));
|
|
24
23
|
const temp_bounds = await this.system_config.getTempBounds();
|
|
@@ -32,7 +31,7 @@ class ThermostatAccessory extends accessory_base_1.BaseAccessory {
|
|
|
32
31
|
// setting name explicitly is needed to not lose the word 'thermostat'
|
|
33
32
|
this.service.setCharacteristic(this.platform.Characteristic.Name, this.accessory.displayName);
|
|
34
33
|
});
|
|
35
|
-
this.system_profile = system.profile;
|
|
34
|
+
this.system_profile = this.system.profile;
|
|
36
35
|
this.system_profile.fetch().then(async () => {
|
|
37
36
|
this.accessory.getService(this.platform.Service.AccessoryInformation)
|
|
38
37
|
.setCharacteristic(this.platform.Characteristic.Manufacturer, `${await this.system_profile.getBrand()} Home`)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessory_thermostat.js","sourceRoot":"","sources":["../src/accessory_thermostat.ts"],"names":[],"mappings":";;;AASA,qEAAyD;AACzD,uCAEmB;AACnB,yEAAiE;AACjE,+DAAmD;AACnD,6DAAiD;AACjD,qDAAiD;AAEjD,MAAa,mBAAoB,SAAQ,8BAAa;IAWpD,YACE,QAA2C,EAC3C,OAA+B;QAE/B,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACzB,
|
|
1
|
+
{"version":3,"file":"accessory_thermostat.js","sourceRoot":"","sources":["../src/accessory_thermostat.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CharacteristicValue } from 'homebridge';
|
|
2
|
-
import { ThermostatCharacteristicWrapper, MultiWrapper } from './
|
|
2
|
+
import { ThermostatCharacteristicWrapper, MultiWrapper } from './characteristics_base';
|
|
3
3
|
declare class CurrentTemp extends ThermostatCharacteristicWrapper {
|
|
4
4
|
ctype: typeof import("hap-nodejs/dist/lib/definitions").CurrentTemperature;
|
|
5
5
|
get: () => Promise<CharacteristicValue>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"characteristics_ac.d.ts","sourceRoot":"","sources":["../src/characteristics_ac.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,+BAA+B,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"characteristics_ac.d.ts","sourceRoot":"","sources":["../src/characteristics_ac.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,+BAA+B,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AA4EvF,cAAM,WAAY,SAAQ,+BAA+B;IACvD,KAAK,sEAA0C;IAC/C,GAAG,qCAKD;CACH;AAqGD,qBAAa,SAAU,SAAQ,YAAY;IACzC,QAAQ,yBAQN;CACH"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ACService = void 0;
|
|
4
|
-
const
|
|
4
|
+
const characteristics_base_1 = require("./characteristics_base");
|
|
5
5
|
const helpers_1 = require("./helpers");
|
|
6
6
|
const infinityApi_1 = require("./infinityApi");
|
|
7
|
-
class CurrentACStatus extends
|
|
7
|
+
class CurrentACStatus extends characteristics_base_1.ThermostatCharacteristicWrapper {
|
|
8
8
|
constructor() {
|
|
9
9
|
super(...arguments);
|
|
10
10
|
this.ctype = this.Characteristic.CurrentHeatingCoolingState;
|
|
@@ -19,13 +19,13 @@ class CurrentACStatus extends base_1.ThermostatCharacteristicWrapper {
|
|
|
19
19
|
case infinityApi_1.SYSTEM_MODE.HEAT:
|
|
20
20
|
return this.Characteristic.CurrentHeatingCoolingState.HEAT;
|
|
21
21
|
default:
|
|
22
|
-
this.log.error(
|
|
22
|
+
this.log.error(`Unknown current state '${current_state}'. Report bug: https://bit.ly/3igbU7D`);
|
|
23
23
|
return this.Characteristic.CurrentHeatingCoolingState.OFF;
|
|
24
24
|
}
|
|
25
25
|
};
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
|
-
class TargetACState extends
|
|
28
|
+
class TargetACState extends characteristics_base_1.ThermostatCharacteristicWrapper {
|
|
29
29
|
constructor() {
|
|
30
30
|
super(...arguments);
|
|
31
31
|
this.ctype = this.Characteristic.TargetHeatingCoolingState;
|
|
@@ -42,7 +42,7 @@ class TargetACState extends base_1.ThermostatCharacteristicWrapper {
|
|
|
42
42
|
case infinityApi_1.SYSTEM_MODE.AUTO:
|
|
43
43
|
return this.Characteristic.TargetHeatingCoolingState.AUTO;
|
|
44
44
|
default:
|
|
45
|
-
this.log.error(
|
|
45
|
+
this.log.error(`Unknown target state '${target_state}'. Report bug: https://bit.ly/3igbU7D`);
|
|
46
46
|
return this.Characteristic.TargetHeatingCoolingState.OFF;
|
|
47
47
|
}
|
|
48
48
|
};
|
|
@@ -65,12 +65,13 @@ class TargetACState extends base_1.ThermostatCharacteristicWrapper {
|
|
|
65
65
|
case this.Characteristic.TargetHeatingCoolingState.AUTO:
|
|
66
66
|
return await this.system.config.setMode(infinityApi_1.SYSTEM_MODE.AUTO);
|
|
67
67
|
default:
|
|
68
|
-
this.log.error(
|
|
68
|
+
this.log.error(`Don't know how to set target state '${value}'. Report bug: https://bit.ly/3igbU7D`);
|
|
69
|
+
throw new this.platform.api.hap.HapStatusError(-70410 /* this.platform.api.hap.HAPStatus.INVALID_VALUE_IN_REQUEST */);
|
|
69
70
|
}
|
|
70
71
|
};
|
|
71
72
|
}
|
|
72
73
|
}
|
|
73
|
-
class DisplayUnits extends
|
|
74
|
+
class DisplayUnits extends characteristics_base_1.ThermostatCharacteristicWrapper {
|
|
74
75
|
constructor() {
|
|
75
76
|
super(...arguments);
|
|
76
77
|
this.ctype = this.Characteristic.CurrentTemperature;
|
|
@@ -81,7 +82,7 @@ class DisplayUnits extends base_1.ThermostatCharacteristicWrapper {
|
|
|
81
82
|
};
|
|
82
83
|
}
|
|
83
84
|
}
|
|
84
|
-
class CurrentTemp extends
|
|
85
|
+
class CurrentTemp extends characteristics_base_1.ThermostatCharacteristicWrapper {
|
|
85
86
|
constructor() {
|
|
86
87
|
super(...arguments);
|
|
87
88
|
this.ctype = this.Characteristic.CurrentTemperature;
|
|
@@ -90,7 +91,7 @@ class CurrentTemp extends base_1.ThermostatCharacteristicWrapper {
|
|
|
90
91
|
};
|
|
91
92
|
}
|
|
92
93
|
}
|
|
93
|
-
class CoolSetpoint extends
|
|
94
|
+
class CoolSetpoint extends characteristics_base_1.ThermostatCharacteristicWrapper {
|
|
94
95
|
constructor() {
|
|
95
96
|
super(...arguments);
|
|
96
97
|
this.ctype = this.Characteristic.CoolingThresholdTemperature;
|
|
@@ -102,7 +103,7 @@ class CoolSetpoint extends base_1.ThermostatCharacteristicWrapper {
|
|
|
102
103
|
};
|
|
103
104
|
}
|
|
104
105
|
}
|
|
105
|
-
class HeatSetpoint extends
|
|
106
|
+
class HeatSetpoint extends characteristics_base_1.ThermostatCharacteristicWrapper {
|
|
106
107
|
constructor() {
|
|
107
108
|
super(...arguments);
|
|
108
109
|
this.ctype = this.Characteristic.HeatingThresholdTemperature;
|
|
@@ -115,7 +116,7 @@ class HeatSetpoint extends base_1.ThermostatCharacteristicWrapper {
|
|
|
115
116
|
};
|
|
116
117
|
}
|
|
117
118
|
}
|
|
118
|
-
class GeneralSetpoint extends
|
|
119
|
+
class GeneralSetpoint extends characteristics_base_1.ThermostatCharacteristicWrapper {
|
|
119
120
|
constructor() {
|
|
120
121
|
super(...arguments);
|
|
121
122
|
/*
|
|
@@ -148,13 +149,13 @@ class GeneralSetpoint extends base_1.ThermostatCharacteristicWrapper {
|
|
|
148
149
|
// For auto mode, Cool/Heat setpoints are used
|
|
149
150
|
return;
|
|
150
151
|
default:
|
|
151
|
-
this.log.error(
|
|
152
|
-
|
|
152
|
+
this.log.error(`Don't know how to set target temp for mode '${mode}'. Report bug: https://bit.ly/3igbU7D`);
|
|
153
|
+
throw new this.platform.api.hap.HapStatusError(-70410 /* this.platform.api.hap.HAPStatus.INVALID_VALUE_IN_REQUEST */);
|
|
153
154
|
}
|
|
154
155
|
};
|
|
155
156
|
}
|
|
156
157
|
}
|
|
157
|
-
class ACService extends
|
|
158
|
+
class ACService extends characteristics_base_1.MultiWrapper {
|
|
158
159
|
constructor() {
|
|
159
160
|
super(...arguments);
|
|
160
161
|
this.WRAPPERS = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"characteristics_ac.js","sourceRoot":"","sources":["../src/characteristics_ac.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"characteristics_ac.js","sourceRoot":"","sources":["../src/characteristics_ac.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,6 @@ declare class Wrapper {
|
|
|
9
9
|
readonly Characteristic: typeof Characteristic;
|
|
10
10
|
protected readonly system: InfinityEvolutionSystemModel;
|
|
11
11
|
protected readonly log: Logger;
|
|
12
|
-
readonly log_prefix: string;
|
|
13
12
|
constructor(platform: CarrierInfinityHomebridgePlatform, context: UnknownContext);
|
|
14
13
|
wrap(service: Service): void;
|
|
15
14
|
}
|
|
@@ -33,4 +32,4 @@ export declare class AccessoryInformation extends Wrapper {
|
|
|
33
32
|
wrap(service: Service): void;
|
|
34
33
|
}
|
|
35
34
|
export {};
|
|
36
|
-
//# sourceMappingURL=
|
|
35
|
+
//# sourceMappingURL=characteristics_base.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"
|
|
1
|
+
{"version":3,"file":"characteristics_base.d.ts","sourceRoot":"","sources":["../src/characteristics_base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,4BAA4B,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3E,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAO/D,cAAM,OAAO;aAOO,QAAQ,EAAE,iCAAiC;IAC3D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,cAAc;IAP5C,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAiC;IACxE,SAAgB,cAAc,EAAE,OAAO,cAAc,CAAwC;IAC7F,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,4BAA4B,CAAoD;IAC3G,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAwD;gBAGpE,QAAQ,EAAE,iCAAiC,EACxC,OAAO,EAAE,cAAc;IAI5C,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAG7B;AAED,8BAAsB,YAAa,SAAQ,OAAO;IAChD,SAAS,CAAC,QAAQ,EAAE,OAAO,OAAO,EAAE,CAAM;IAE1C,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAQ7B;AAED,8BAAsB,qBAAsB,SAAQ,OAAO;IACzD,SAAgB,KAAK,EAAE,QAAQ,CAAC,UAAU,cAAc,CAAC,CAAC;IAC1D,SAAS,CAAC,KAAK,KAAM;IACrB,SAAS,CAAC,GAAG,EAAE,CAAC,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAC,GAAG,SAAS,CAAC;IAChE,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC;IAE3E,SAAS,CAAC,aAAa,EAAE,mBAAmB,GAAG,IAAI,CAAQ;IAE3D,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAsB7B;AAED,8BAAsB,+BAAgC,SAAQ,qBAAqB;IAG3E,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAS9B,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;CAqBrC;AAED,qBAAa,oBAAqB,SAAQ,OAAO;IAC/C,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAQ7B"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AccessoryInformation = exports.ThermostatCharacteristicWrapper = exports.CharacteristicWrapper = exports.MultiWrapper = void 0;
|
|
4
4
|
const infinityApi_1 = require("./infinityApi");
|
|
5
|
+
const helper_logging_1 = require("./helper_logging");
|
|
5
6
|
/*
|
|
6
7
|
* Helpers to add handlers to the HAP Service and Characteristic objects.
|
|
7
8
|
*/
|
|
@@ -12,8 +13,7 @@ class Wrapper {
|
|
|
12
13
|
this.Service = this.platform.api.hap.Service;
|
|
13
14
|
this.Characteristic = this.platform.api.hap.Characteristic;
|
|
14
15
|
this.system = this.platform.systems[this.context.serialNumber];
|
|
15
|
-
this.log = this.
|
|
16
|
-
this.log_prefix = `[${context.serialNumber} ${context.name}] `;
|
|
16
|
+
this.log = new helper_logging_1.PrefixLogger(this.system.log, this.context.name);
|
|
17
17
|
}
|
|
18
18
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
19
19
|
wrap(service) {
|
|
@@ -107,4 +107,4 @@ class AccessoryInformation extends Wrapper {
|
|
|
107
107
|
}
|
|
108
108
|
}
|
|
109
109
|
exports.AccessoryInformation = AccessoryInformation;
|
|
110
|
-
//# sourceMappingURL=
|
|
110
|
+
//# sourceMappingURL=characteristics_base.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"characteristics_base.js","sourceRoot":"","sources":["../src/characteristics_base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CharacteristicValue } from 'homebridge';
|
|
2
|
-
import { ThermostatCharacteristicWrapper, MultiWrapper } from './
|
|
2
|
+
import { ThermostatCharacteristicWrapper, MultiWrapper } from './characteristics_base';
|
|
3
3
|
declare class FanStatus extends ThermostatCharacteristicWrapper {
|
|
4
4
|
ctype: typeof import("hap-nodejs/dist/lib/definitions").Active;
|
|
5
5
|
get: () => Promise<1 | 0>;
|
|
@@ -1 +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,
|
|
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;AAqBvF,cAAM,SAAU,SAAQ,+BAA+B;IACrD,KAAK,0DAA8B;IACnC,GAAG,uBAwBD;IAEF,GAAG,UAAiB,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,UAAiB,mBAAmB,mBAcrC;CACH;AAED,cAAM,cAAe,SAAQ,+BAA+B;IAC1D,KAAK,kEAAsC;IAE3C,GAAG,uBAOD;IAEF,GAAG,UAAiB,mBAAmB,mBAgBrC;CACH;AAED,qBAAa,UAAW,SAAQ,YAAY;IAC1C,QAAQ,mFAKN;CACH"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.FanService = void 0;
|
|
4
|
-
const
|
|
4
|
+
const characteristics_base_1 = require("./characteristics_base");
|
|
5
5
|
const helpers_1 = require("./helpers");
|
|
6
6
|
const infinityApi_1 = require("./infinityApi");
|
|
7
7
|
/*
|
|
@@ -20,7 +20,7 @@ const infinityApi_1 = require("./infinityApi");
|
|
|
20
20
|
* will be changed to FAN_ONLY mode. To get out of FAN_ONLY mode, the user can
|
|
21
21
|
* change the thermostat to an ON mode (HEAT/COOL/AUTO).
|
|
22
22
|
*/
|
|
23
|
-
class FanStatus extends
|
|
23
|
+
class FanStatus extends characteristics_base_1.ThermostatCharacteristicWrapper {
|
|
24
24
|
constructor() {
|
|
25
25
|
super(...arguments);
|
|
26
26
|
this.ctype = this.Characteristic.Active;
|
|
@@ -64,7 +64,7 @@ class FanStatus extends base_1.ThermostatCharacteristicWrapper {
|
|
|
64
64
|
};
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
|
-
class FanState extends
|
|
67
|
+
class FanState extends characteristics_base_1.ThermostatCharacteristicWrapper {
|
|
68
68
|
constructor() {
|
|
69
69
|
super(...arguments);
|
|
70
70
|
this.ctype = this.Characteristic.CurrentFanState;
|
|
@@ -96,7 +96,7 @@ class FanState extends base_1.ThermostatCharacteristicWrapper {
|
|
|
96
96
|
};
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
|
-
class FanSpeed extends
|
|
99
|
+
class FanSpeed extends characteristics_base_1.ThermostatCharacteristicWrapper {
|
|
100
100
|
constructor() {
|
|
101
101
|
super(...arguments);
|
|
102
102
|
this.ctype = this.Characteristic.RotationSpeed;
|
|
@@ -114,7 +114,7 @@ class FanSpeed extends base_1.ThermostatCharacteristicWrapper {
|
|
|
114
114
|
};
|
|
115
115
|
}
|
|
116
116
|
}
|
|
117
|
-
class TargetFanState extends
|
|
117
|
+
class TargetFanState extends characteristics_base_1.ThermostatCharacteristicWrapper {
|
|
118
118
|
constructor() {
|
|
119
119
|
super(...arguments);
|
|
120
120
|
this.ctype = this.Characteristic.TargetFanState;
|
|
@@ -135,7 +135,7 @@ class TargetFanState extends base_1.ThermostatCharacteristicWrapper {
|
|
|
135
135
|
};
|
|
136
136
|
}
|
|
137
137
|
}
|
|
138
|
-
class FanService extends
|
|
138
|
+
class FanService extends characteristics_base_1.MultiWrapper {
|
|
139
139
|
constructor() {
|
|
140
140
|
super(...arguments);
|
|
141
141
|
this.WRAPPERS = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"characteristics_fan.js","sourceRoot":"","sources":["../src/characteristics_fan.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"characteristics_fan.js","sourceRoot":"","sources":["../src/characteristics_fan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CharacteristicWrapper, MultiWrapper } from './
|
|
1
|
+
import { CharacteristicWrapper, MultiWrapper } from './characteristics_base';
|
|
2
2
|
declare class FilterLife extends CharacteristicWrapper {
|
|
3
3
|
ctype: typeof import("hap-nodejs/dist/lib/definitions").FilterLifeLevel;
|
|
4
4
|
get: () => Promise<number>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"characteristics_filter.d.ts","sourceRoot":"","sources":["../src/characteristics_filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.FilterService = void 0;
|
|
4
|
-
const
|
|
5
|
-
class FilterLife extends
|
|
4
|
+
const characteristics_base_1 = require("./characteristics_base");
|
|
5
|
+
class FilterLife extends characteristics_base_1.CharacteristicWrapper {
|
|
6
6
|
constructor() {
|
|
7
7
|
super(...arguments);
|
|
8
8
|
this.ctype = this.Characteristic.FilterLifeLevel;
|
|
@@ -11,7 +11,7 @@ class FilterLife extends base_1.CharacteristicWrapper {
|
|
|
11
11
|
};
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
|
-
class FilterChange extends
|
|
14
|
+
class FilterChange extends characteristics_base_1.CharacteristicWrapper {
|
|
15
15
|
constructor() {
|
|
16
16
|
super(...arguments);
|
|
17
17
|
this.ctype = this.Characteristic.FilterChangeIndication;
|
|
@@ -22,7 +22,7 @@ class FilterChange extends base_1.CharacteristicWrapper {
|
|
|
22
22
|
};
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
|
-
class FilterService extends
|
|
25
|
+
class FilterService extends characteristics_base_1.MultiWrapper {
|
|
26
26
|
constructor() {
|
|
27
27
|
super(...arguments);
|
|
28
28
|
this.WRAPPERS = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"characteristics_filter.js","sourceRoot":"","sources":["../src/characteristics_filter.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CharacteristicWrapper, MultiWrapper } from './
|
|
1
|
+
import { CharacteristicWrapper, MultiWrapper } from './characteristics_base';
|
|
2
2
|
declare class CurrentRH extends CharacteristicWrapper {
|
|
3
3
|
ctype: typeof import("hap-nodejs/dist/lib/definitions").CurrentRelativeHumidity;
|
|
4
4
|
get: () => Promise<number>;
|
|
@@ -1 +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,
|
|
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,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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.HumidifierService = exports.ThermostatRHService = void 0;
|
|
4
|
-
const
|
|
5
|
-
class CurrentRH extends
|
|
4
|
+
const characteristics_base_1 = require("./characteristics_base");
|
|
5
|
+
class CurrentRH extends characteristics_base_1.CharacteristicWrapper {
|
|
6
6
|
constructor() {
|
|
7
7
|
super(...arguments);
|
|
8
8
|
this.ctype = this.Characteristic.CurrentRelativeHumidity;
|
|
@@ -11,19 +11,19 @@ class CurrentRH extends base_1.CharacteristicWrapper {
|
|
|
11
11
|
};
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
|
-
class TargetDehumidify extends
|
|
14
|
+
class TargetDehumidify extends characteristics_base_1.CharacteristicWrapper {
|
|
15
15
|
constructor() {
|
|
16
16
|
super(...arguments);
|
|
17
17
|
this.ctype = this.Characteristic.RelativeHumidityDehumidifierThreshold;
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
|
-
class TargetHumidify extends
|
|
20
|
+
class TargetHumidify extends characteristics_base_1.CharacteristicWrapper {
|
|
21
21
|
constructor() {
|
|
22
22
|
super(...arguments);
|
|
23
23
|
this.ctype = this.Characteristic.RelativeHumidityHumidifierThreshold;
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
|
-
class ThermostatRHService extends
|
|
26
|
+
class ThermostatRHService extends characteristics_base_1.MultiWrapper {
|
|
27
27
|
constructor() {
|
|
28
28
|
super(...arguments);
|
|
29
29
|
this.WRAPPERS = [
|
|
@@ -32,7 +32,7 @@ class ThermostatRHService extends base_1.MultiWrapper {
|
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
exports.ThermostatRHService = ThermostatRHService;
|
|
35
|
-
class HumidifierService extends
|
|
35
|
+
class HumidifierService extends characteristics_base_1.MultiWrapper {
|
|
36
36
|
constructor() {
|
|
37
37
|
super(...arguments);
|
|
38
38
|
this.WRAPPERS = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"characteristics_humidity.js","sourceRoot":"","sources":["../src/characteristics_humidity.ts"],"names":[],"mappings":";;;AAAA,
|
|
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,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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { Logger, LogLevel } from 'homebridge';
|
|
2
|
+
export declare class PrefixLogger implements Logger {
|
|
3
|
+
private readonly internal;
|
|
4
|
+
readonly prefix: string;
|
|
5
|
+
constructor(internal: Logger, prefix: string);
|
|
6
|
+
info(message: string, ...parameters: any[]): void;
|
|
7
|
+
warn(message: string, ...parameters: any[]): void;
|
|
8
|
+
error(message: string, ...parameters: any[]): void;
|
|
9
|
+
debug(message: string, ...parameters: any[]): void;
|
|
10
|
+
log(level: LogLevel, message: string, ...parameters: any[]): void;
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=helper_logging.d.ts.map
|
|
@@ -0,0 +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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PrefixLogger = void 0;
|
|
4
|
+
class PrefixLogger {
|
|
5
|
+
constructor(internal, prefix) {
|
|
6
|
+
this.internal = internal;
|
|
7
|
+
this.prefix = prefix;
|
|
8
|
+
}
|
|
9
|
+
info(message, ...parameters) {
|
|
10
|
+
this.log("info" /* LogLevel.INFO */, message, ...parameters);
|
|
11
|
+
}
|
|
12
|
+
warn(message, ...parameters) {
|
|
13
|
+
this.log("warn" /* LogLevel.WARN */, message, ...parameters);
|
|
14
|
+
}
|
|
15
|
+
error(message, ...parameters) {
|
|
16
|
+
this.log("error" /* LogLevel.ERROR */, message, ...parameters);
|
|
17
|
+
}
|
|
18
|
+
debug(message, ...parameters) {
|
|
19
|
+
this.log("debug" /* LogLevel.DEBUG */, message, ...parameters);
|
|
20
|
+
}
|
|
21
|
+
log(level, message, ...parameters) {
|
|
22
|
+
this.internal.log(level, `[${this.prefix}] ${message}`, ...parameters);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
exports.PrefixLogger = PrefixLogger;
|
|
26
|
+
//# sourceMappingURL=helper_logging.js.map
|
|
@@ -0,0 +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"}
|
package/dist/infinityApi.d.ts
CHANGED
|
@@ -42,6 +42,7 @@ declare abstract class BaseInfinityEvolutionApiModel {
|
|
|
42
42
|
protected data_object_hash?: string;
|
|
43
43
|
protected HASH_IGNORE_KEYS: Set<string>;
|
|
44
44
|
protected write_lock: Mutex;
|
|
45
|
+
protected log: Logger;
|
|
45
46
|
constructor(api_connection: InfinityEvolutionApiConnection);
|
|
46
47
|
abstract getPath(): string;
|
|
47
48
|
protected hashDataObject(): string;
|
|
@@ -55,9 +56,10 @@ export declare class InfinityEvolutionLocations extends BaseInfinityEvolutionApi
|
|
|
55
56
|
declare abstract class BaseInfinityEvolutionSystemApiModel extends BaseInfinityEvolutionApiModel {
|
|
56
57
|
protected readonly api_connection: InfinityEvolutionApiConnection;
|
|
57
58
|
readonly serialNumber: string;
|
|
59
|
+
protected readonly log: Logger;
|
|
58
60
|
private last_updated;
|
|
59
61
|
protected HASH_IGNORE_KEYS: Set<string>;
|
|
60
|
-
constructor(api_connection: InfinityEvolutionApiConnection, serialNumber: string);
|
|
62
|
+
constructor(api_connection: InfinityEvolutionApiConnection, serialNumber: string, log: Logger);
|
|
61
63
|
protected forceFetch(): Promise<void>;
|
|
62
64
|
}
|
|
63
65
|
export declare class InfinityEvolutionSystemProfile extends BaseInfinityEvolutionSystemApiModel {
|
|
@@ -115,6 +117,7 @@ export declare class InfinityEvolutionSystemModel {
|
|
|
115
117
|
status: InfinityEvolutionSystemStatus;
|
|
116
118
|
config: InfinityEvolutionSystemConfig;
|
|
117
119
|
profile: InfinityEvolutionSystemProfile;
|
|
120
|
+
log: Logger;
|
|
118
121
|
constructor(api_connection: InfinityEvolutionApiConnection, serialNumber: string);
|
|
119
122
|
}
|
|
120
123
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"infinityApi.d.ts","sourceRoot":"","sources":["../src/infinityApi.ts"],"names":[],"mappings":"AAGA,OAAc,EAAE,aAAa,EAAsB,MAAM,OAAO,CAAC;AAGjE,OAAO,EAAE,KAAK,EAA4C,MAAM,aAAa,CAAC;AAE9E,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"infinityApi.d.ts","sourceRoot":"","sources":["../src/infinityApi.ts"],"names":[],"mappings":"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"}
|
package/dist/infinityApi.js
CHANGED
|
@@ -41,6 +41,7 @@ const typescript_memoize_1 = require("typescript-memoize");
|
|
|
41
41
|
const async_mutex_1 = require("async-mutex");
|
|
42
42
|
const xml2js = __importStar(require("xml2js"));
|
|
43
43
|
const object_hash_1 = __importDefault(require("object-hash"));
|
|
44
|
+
const helper_logging_1 = require("./helper_logging");
|
|
44
45
|
exports.SYSTEM_MODE = {
|
|
45
46
|
OFF: 'off',
|
|
46
47
|
COOL: 'cool',
|
|
@@ -175,6 +176,7 @@ class BaseInfinityEvolutionApiModel {
|
|
|
175
176
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
176
177
|
this.data_object = null;
|
|
177
178
|
this.HASH_IGNORE_KEYS = new Set();
|
|
179
|
+
this.log = this.api_connection.log;
|
|
178
180
|
this.write_lock = new async_mutex_1.Mutex();
|
|
179
181
|
}
|
|
180
182
|
hashDataObject() {
|
|
@@ -191,7 +193,7 @@ class BaseInfinityEvolutionApiModel {
|
|
|
191
193
|
}
|
|
192
194
|
catch (e) {
|
|
193
195
|
if (e !== async_mutex_1.E_ALREADY_LOCKED) {
|
|
194
|
-
this.
|
|
196
|
+
this.log.error(`Deadlock on fetch ${e}. Report bug: https://bit.ly/3igbU7D`);
|
|
195
197
|
}
|
|
196
198
|
}
|
|
197
199
|
}
|
|
@@ -204,10 +206,10 @@ class BaseInfinityEvolutionApiModel {
|
|
|
204
206
|
}
|
|
205
207
|
catch (error) {
|
|
206
208
|
if (axios_1.default.isAxiosError(error)) {
|
|
207
|
-
this.
|
|
209
|
+
this.log.error('Failed to fetch updates (axios): ', error.message);
|
|
208
210
|
}
|
|
209
211
|
else {
|
|
210
|
-
this.
|
|
212
|
+
this.log.error('Failed to fetch updates (unknown): ', error);
|
|
211
213
|
}
|
|
212
214
|
}
|
|
213
215
|
}
|
|
@@ -223,7 +225,7 @@ class InfinityEvolutionLocations extends BaseInfinityEvolutionApiModel {
|
|
|
223
225
|
await this.fetch();
|
|
224
226
|
const systems = [];
|
|
225
227
|
for (const location of this.data_object.locations.location) {
|
|
226
|
-
for (const system of location.systems[0].system) {
|
|
228
|
+
for (const system of location.systems[0].system || []) {
|
|
227
229
|
const link_parts = system['atom:link'][0]['$']['href'].split('/');
|
|
228
230
|
systems.push(link_parts[link_parts.length - 1]);
|
|
229
231
|
}
|
|
@@ -233,10 +235,11 @@ class InfinityEvolutionLocations extends BaseInfinityEvolutionApiModel {
|
|
|
233
235
|
}
|
|
234
236
|
exports.InfinityEvolutionLocations = InfinityEvolutionLocations;
|
|
235
237
|
class BaseInfinityEvolutionSystemApiModel extends BaseInfinityEvolutionApiModel {
|
|
236
|
-
constructor(api_connection, serialNumber) {
|
|
238
|
+
constructor(api_connection, serialNumber, log) {
|
|
237
239
|
super(api_connection);
|
|
238
240
|
this.api_connection = api_connection;
|
|
239
241
|
this.serialNumber = serialNumber;
|
|
242
|
+
this.log = log;
|
|
240
243
|
this.last_updated = 0; // TODO use this
|
|
241
244
|
this.HASH_IGNORE_KEYS = new Set(['timestamp', 'localTime']);
|
|
242
245
|
}
|
|
@@ -480,16 +483,16 @@ class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel
|
|
|
480
483
|
await new Promise(r => setTimeout(r, 5000));
|
|
481
484
|
await this.forceFetch();
|
|
482
485
|
if (mutated_hash === this.data_object_hash) {
|
|
483
|
-
this.
|
|
486
|
+
this.log.info('Changes sent to carrier api successfully.');
|
|
484
487
|
}
|
|
485
488
|
else {
|
|
486
|
-
this.
|
|
489
|
+
this.log.warn('Changes may not have successfully propagated to the carrier api.');
|
|
487
490
|
}
|
|
488
491
|
});
|
|
489
492
|
}
|
|
490
493
|
catch (e) {
|
|
491
494
|
if (e !== async_mutex_1.E_CANCELED) {
|
|
492
|
-
this.
|
|
495
|
+
this.log.error(`Deadlock on push ${e}. Report bug: https://bit.ly/3igbU7D`);
|
|
493
496
|
}
|
|
494
497
|
}
|
|
495
498
|
}
|
|
@@ -502,7 +505,7 @@ class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel
|
|
|
502
505
|
const old_hash = this.data_object_hash;
|
|
503
506
|
await this.forceFetch();
|
|
504
507
|
if (old_hash !== this.data_object_hash) {
|
|
505
|
-
this.
|
|
508
|
+
this.log.warn('Cached config was stale before mutation and push.');
|
|
506
509
|
}
|
|
507
510
|
// Take config mutations of the queue and run them.
|
|
508
511
|
// TODO make mutations non-async. these need to happen in order. and async
|
|
@@ -516,13 +519,13 @@ class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel
|
|
|
516
519
|
const mutated_hash = this.hashDataObject();
|
|
517
520
|
// If nothing actually changed, no need to push.
|
|
518
521
|
if (old_hash === mutated_hash) {
|
|
519
|
-
this.
|
|
522
|
+
this.log.warn('Config doesn\'t appear to have changed. No changes sent.');
|
|
520
523
|
return null;
|
|
521
524
|
}
|
|
522
525
|
return mutated_hash;
|
|
523
526
|
}
|
|
524
527
|
async forcePush() {
|
|
525
|
-
this.
|
|
528
|
+
this.log.info('Pushing changes to carrier api...');
|
|
526
529
|
const builder = new xml2js.Builder();
|
|
527
530
|
const new_xml = builder.buildObject(this.data_object);
|
|
528
531
|
const data = `data=${encodeURIComponent(new_xml)}`;
|
|
@@ -535,10 +538,10 @@ class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel
|
|
|
535
538
|
}
|
|
536
539
|
catch (error) {
|
|
537
540
|
if (axios_1.default.isAxiosError(error)) {
|
|
538
|
-
this.
|
|
541
|
+
this.log.error('Failed to push updates (axios): ', error.message);
|
|
539
542
|
}
|
|
540
543
|
else {
|
|
541
|
-
this.
|
|
544
|
+
this.log.error('Failed to push updates (unknown): ', error);
|
|
542
545
|
}
|
|
543
546
|
}
|
|
544
547
|
}
|
|
@@ -604,9 +607,11 @@ class InfinityEvolutionSystemModel {
|
|
|
604
607
|
constructor(api_connection, serialNumber) {
|
|
605
608
|
this.api_connection = api_connection;
|
|
606
609
|
this.serialNumber = serialNumber;
|
|
607
|
-
this.
|
|
608
|
-
|
|
609
|
-
this.
|
|
610
|
+
this.log = new helper_logging_1.PrefixLogger(this.api_connection.log, this.serialNumber);
|
|
611
|
+
const api_logger = new helper_logging_1.PrefixLogger(this.log, 'API');
|
|
612
|
+
this.status = new InfinityEvolutionSystemStatus(api_connection, serialNumber, api_logger);
|
|
613
|
+
this.config = new InfinityEvolutionSystemConfig(api_connection, serialNumber, api_logger);
|
|
614
|
+
this.profile = new InfinityEvolutionSystemProfile(api_connection, serialNumber, api_logger);
|
|
610
615
|
}
|
|
611
616
|
}
|
|
612
617
|
exports.InfinityEvolutionSystemModel = InfinityEvolutionSystemModel;
|
package/dist/infinityApi.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"infinityApi.js","sourceRoot":"","sources":["../src/infinityApi.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"infinityApi.js","sourceRoot":"","sources":["../src/infinityApi.ts"],"names":[],"mappings":"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"}
|
package/dist/platform.js
CHANGED
|
@@ -41,8 +41,7 @@ class CarrierInfinityHomebridgePlatform {
|
|
|
41
41
|
this.systems[serialNumber] = system;
|
|
42
42
|
// Add system based accessories
|
|
43
43
|
const context_system = { serialNumber: system.serialNumber };
|
|
44
|
-
|
|
45
|
-
this.log.info(log_prefix + 'Discovered system');
|
|
44
|
+
system.log.info('Discovered system');
|
|
46
45
|
// -> System Accessory: Outdoor Temp Sensor
|
|
47
46
|
if (this.config['showOutdoorTemperatureSensor']) {
|
|
48
47
|
new accessory_oat_1.OutdoorTemperatureAccessory(this, { ...context_system, name: 'Outdoor Temperature' });
|
|
@@ -51,7 +50,7 @@ class CarrierInfinityHomebridgePlatform {
|
|
|
51
50
|
const zones = await system.profile.getZones();
|
|
52
51
|
for (const zone of zones) { // 'of' makes sure we go through zone ids, not index
|
|
53
52
|
const context_zone = { ...context_system, zone: zone };
|
|
54
|
-
|
|
53
|
+
system.log.debug(`Discovered zone ${context_zone.zone}`);
|
|
55
54
|
// -> Zone Accessory: Thermostat
|
|
56
55
|
new accessory_thermostat_1.ThermostatAccessory(this, {
|
|
57
56
|
...context_zone,
|
|
@@ -81,7 +80,8 @@ class CarrierInfinityHomebridgePlatform {
|
|
|
81
80
|
for (const id in this.restored_accessories) {
|
|
82
81
|
if (!this.accessories[id]) {
|
|
83
82
|
const accessory = this.restored_accessories[id];
|
|
84
|
-
|
|
83
|
+
// TODO Use different logger
|
|
84
|
+
this.log.info(`[${accessory.context.serialNumber}] [${accessory.context.name}] Removed (stale)`);
|
|
85
85
|
this.api.unregisterPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
|
|
86
86
|
delete this.restored_accessories[id];
|
|
87
87
|
}
|
package/dist/platform.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":";;;AAEA,yCAAwD;AACxD,iEAA6D;AAC7D,mDAA8D;AAC9D,+CAIuB;AACvB,+DAA2D;AAE3D,6EAAwE;AAExE,MAAa,iCAAiC;IAa5C,YACkB,GAAW,EACX,MAAsB,EACtB,GAAQ;QAFR,QAAG,GAAH,GAAG,CAAQ;QACX,WAAM,GAAN,MAAM,CAAgB;QACtB,QAAG,GAAH,GAAG,CAAK;QAfV,YAAO,GAAmB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;QAC/C,mBAAc,GAA0B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC;QAEpF,oDAAoD;QACpC,yBAAoB,GAAsC,EAAE,CAAC;QAC7E,mDAAmD;QACnC,gBAAW,GAAkC,EAAE,CAAC;QAIzD,YAAO,GAAiD,EAAE,CAAC;QAOhE,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACxC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qFAAqF,CAAC,CAAC;SACvG;QAED,IAAI,CAAC,cAAc,GAAG,IAAI,4CAA8B,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3G,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,CAAC;QAE1C,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;YACrC,IAAI,CAAC,eAAe,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBAC1C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;YACjE,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB,CAAC,SAA4B;QAC7C,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,MAAM,OAAO,GAAG,MAAM,IAAI,wCAA0B,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,UAAU,EAAE,CAAC;QACvF,KAAK,MAAM,YAAY,IAAI,OAAO,EAAE;YAClC,yDAAyD;YACzD,MAAM,MAAM,GAAG,IAAI,0CAA4B,CAAC,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;YACnF,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;YAEpC,+BAA+B;YAC/B,MAAM,cAAc,GAAG,EAAC,YAAY,EAAE,MAAM,CAAC,YAAY,EAAC,CAAC;YAC3D,MAAM,
|
|
1
|
+
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"displayName": "Homebridge Carrier Infinity",
|
|
3
3
|
"name": "homebridge-carrier-infinity",
|
|
4
|
-
"version": "1.6.
|
|
4
|
+
"version": "1.6.3",
|
|
5
5
|
"description": "Standalone homebridge plugin for Carrier Infinity / Bryant Evolution / ICP Brands Ion thermostats.",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"repository": {
|
package/dist/base.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"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"}
|