homebridge-carrier-infinity 1.6.9 → 1.7.0-beta.1
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_comfort_activity.d.ts.map +1 -1
- package/dist/accessory_comfort_activity.js +6 -9
- package/dist/accessory_comfort_activity.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 -3
- package/dist/accessory_oat.js.map +1 -1
- package/dist/accessory_thermostat.d.ts.map +1 -1
- package/dist/accessory_thermostat.js +6 -27
- package/dist/accessory_thermostat.js.map +1 -1
- package/dist/api/helpers.d.ts +5 -0
- package/dist/api/helpers.d.ts.map +1 -0
- package/dist/api/helpers.js +31 -0
- package/dist/api/helpers.js.map +1 -0
- package/dist/api/helpers_rxjs.d.ts +3 -0
- package/dist/api/helpers_rxjs.d.ts.map +1 -0
- package/dist/api/helpers_rxjs.js +16 -0
- package/dist/api/helpers_rxjs.js.map +1 -0
- package/dist/api/models.d.ts +78 -56
- package/dist/api/models.d.ts.map +1 -1
- package/dist/api/models.js +352 -356
- package/dist/api/models.js.map +1 -1
- package/dist/api/oauth.js +1 -1
- package/dist/api/oauth.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 +70 -42
- package/dist/characteristics_ac.js.map +1 -1
- package/dist/characteristics_base.d.ts +9 -6
- package/dist/characteristics_base.d.ts.map +1 -1
- package/dist/characteristics_base.js +56 -37
- package/dist/characteristics_base.js.map +1 -1
- package/dist/characteristics_fan.d.ts +6 -6
- package/dist/characteristics_fan.d.ts.map +1 -1
- package/dist/characteristics_fan.js +75 -63
- 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 +5 -8
- package/dist/characteristics_filter.js.map +1 -1
- package/dist/characteristics_humidity.d.ts +2 -5
- package/dist/characteristics_humidity.d.ts.map +1 -1
- package/dist/characteristics_humidity.js +9 -17
- package/dist/characteristics_humidity.js.map +1 -1
- package/dist/platform.d.ts.map +1 -1
- package/dist/platform.js +12 -6
- package/dist/platform.js.map +1 -1
- package/package.json +28 -23
package/dist/api/models.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/api/models.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/api/models.ts"],"names":[],"mappings":"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"}
|
package/dist/api/oauth.js
CHANGED
|
@@ -44,7 +44,7 @@ class OAuthHeaders {
|
|
|
44
44
|
if (config.headers === undefined) {
|
|
45
45
|
config.headers = {};
|
|
46
46
|
}
|
|
47
|
-
config.headers
|
|
47
|
+
config.headers['Authorization'] = this.genHeader(config.method || 'GET', config.url || '/', username, token, config.data);
|
|
48
48
|
return config;
|
|
49
49
|
}
|
|
50
50
|
}
|
package/dist/api/oauth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../src/api/oauth.ts"],"names":[],"mappings":";;;;;;AAAA,0CAAsF;AAGtF,sEAA6C;AAE7C,MAAa,YAAY;IACvB,MAAM,CAAC,SAAS,CAAC,UAAkB,EAAE,GAAW,EAAE,QAAgB,EAAE,KAAa,EAAE,IAAmB;QACpG,4BAA4B;QAC5B,MAAM,iBAAiB,GAAG;YACxB,kBAAkB,EAAG,oCAAyB;YAC9C,WAAW,EAAG,QAAQ;YACtB,sBAAsB,EAAG,WAAW;YACpC,eAAe,EAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;YAC/C,0BAA0B;YAC1B,WAAW,EAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC;YAC1D,aAAa,EAAG,KAAK;SACtB,CAAC;QAEF,+CAA+C;QAC/C,MAAM,eAAe,GAAG,EAAE,CAAC;QAC3B,IAAI,IAAI,EAAE;YACR,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC9B,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;gBACrB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACjC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;aACxD;SACF;QACD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,iBAAiB,EAAE,eAAe,CAAC,CAAC;QAGzE,eAAe;QACf,MAAM,SAAS,GAAG,yBAAc,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,uCAA4B,EAAE,KAAK,CAAC,CAAC;QAC5G,mBAAmB;QACnB,MAAM,aAAa,GAAG;YACpB,SAAS,kBAAkB,CAAC,GAAG,CAAC,EAAE;SACnC,CAAC;QACF,KAAK,MAAM,CAAC,IAAI,iBAAiB,EAAE;YACjC,aAAa,CAAC,IAAI,CAChB,GAAG,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,CACxB,CAAC;SACH;QACD,aAAa,CAAC,IAAI,CAAC,mBAAmB,SAAS,EAAE,CAAC,CAAC;QACnD,OAAO,SAAS,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,MAA0B,EAAE,QAAgB,EAAE,KAAa;QAC1E,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE;YAChC,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC;SACrB;QACD,MAAM,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../src/api/oauth.ts"],"names":[],"mappings":";;;;;;AAAA,0CAAsF;AAGtF,sEAA6C;AAE7C,MAAa,YAAY;IACvB,MAAM,CAAC,SAAS,CAAC,UAAkB,EAAE,GAAW,EAAE,QAAgB,EAAE,KAAa,EAAE,IAAmB;QACpG,4BAA4B;QAC5B,MAAM,iBAAiB,GAAG;YACxB,kBAAkB,EAAG,oCAAyB;YAC9C,WAAW,EAAG,QAAQ;YACtB,sBAAsB,EAAG,WAAW;YACpC,eAAe,EAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;YAC/C,0BAA0B;YAC1B,WAAW,EAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC;YAC1D,aAAa,EAAG,KAAK;SACtB,CAAC;QAEF,+CAA+C;QAC/C,MAAM,eAAe,GAAG,EAAE,CAAC;QAC3B,IAAI,IAAI,EAAE;YACR,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC9B,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;gBACrB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACjC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;aACxD;SACF;QACD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,iBAAiB,EAAE,eAAe,CAAC,CAAC;QAGzE,eAAe;QACf,MAAM,SAAS,GAAG,yBAAc,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,uCAA4B,EAAE,KAAK,CAAC,CAAC;QAC5G,mBAAmB;QACnB,MAAM,aAAa,GAAG;YACpB,SAAS,kBAAkB,CAAC,GAAG,CAAC,EAAE;SACnC,CAAC;QACF,KAAK,MAAM,CAAC,IAAI,iBAAiB,EAAE;YACjC,aAAa,CAAC,IAAI,CAChB,GAAG,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,CACxB,CAAC;SACH;QACD,aAAa,CAAC,IAAI,CAAC,mBAAmB,SAAS,EAAE,CAAC,CAAC;QACnD,OAAO,SAAS,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,MAA0B,EAAE,QAAgB,EAAE,KAAa;QAC1E,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE;YAChC,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC;SACrB;QACD,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,IAAI,KAAK,EAAE,MAAM,CAAC,GAAG,IAAI,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAC1H,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AA/CD,oCA+CC"}
|
|
@@ -2,7 +2,7 @@ import { CharacteristicValue } from 'homebridge';
|
|
|
2
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
|
+
value: import("rxjs").Observable<CharacteristicValue>;
|
|
6
6
|
}
|
|
7
7
|
export declare class ACService extends MultiWrapper {
|
|
8
8
|
WRAPPERS: (typeof CurrentTemp)[];
|
|
@@ -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,wBAAwB,CAAC;
|
|
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;AA2EvF,cAAM,WAAY,SAAQ,+BAA+B;IACvD,KAAK,sEAA0C;IAC/C,KAAK,iDAIF;CACJ;AAqJD,qBAAa,SAAU,SAAQ,YAAY;IACzC,QAAQ,yBAQN;CACH"}
|
|
@@ -4,13 +4,13 @@ exports.ACService = void 0;
|
|
|
4
4
|
const characteristics_base_1 = require("./characteristics_base");
|
|
5
5
|
const helpers_1 = require("./helpers");
|
|
6
6
|
const constants_1 = require("./api/constants");
|
|
7
|
+
const rxjs_1 = require("rxjs");
|
|
7
8
|
class CurrentACStatus extends characteristics_base_1.ThermostatCharacteristicWrapper {
|
|
8
9
|
constructor() {
|
|
9
10
|
super(...arguments);
|
|
10
11
|
this.ctype = this.Characteristic.CurrentHeatingCoolingState;
|
|
11
|
-
this.
|
|
12
|
-
|
|
13
|
-
switch (current_state) {
|
|
12
|
+
this.value = this.system.status.getZone(this.context.zone).mode.pipe((0, rxjs_1.map)(data => {
|
|
13
|
+
switch (data) {
|
|
14
14
|
case constants_1.SYSTEM_MODE.OFF:
|
|
15
15
|
case constants_1.SYSTEM_MODE.FAN_ONLY:
|
|
16
16
|
return this.Characteristic.CurrentHeatingCoolingState.OFF;
|
|
@@ -19,19 +19,18 @@ class CurrentACStatus extends characteristics_base_1.ThermostatCharacteristicWra
|
|
|
19
19
|
case constants_1.SYSTEM_MODE.HEAT:
|
|
20
20
|
return this.Characteristic.CurrentHeatingCoolingState.HEAT;
|
|
21
21
|
default:
|
|
22
|
-
this.log.error(`Unknown current state '${
|
|
22
|
+
this.log.error(`Unknown current state '${data}'. Report bug: https://bit.ly/3igbU7D`);
|
|
23
23
|
return this.Characteristic.CurrentHeatingCoolingState.OFF;
|
|
24
24
|
}
|
|
25
|
-
};
|
|
25
|
+
}));
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
class TargetACState extends characteristics_base_1.ThermostatCharacteristicWrapper {
|
|
29
29
|
constructor() {
|
|
30
30
|
super(...arguments);
|
|
31
31
|
this.ctype = this.Characteristic.TargetHeatingCoolingState;
|
|
32
|
-
this.
|
|
33
|
-
|
|
34
|
-
switch (target_state) {
|
|
32
|
+
this.value = this.system.config.mode.pipe((0, rxjs_1.map)(data => {
|
|
33
|
+
switch (data) {
|
|
35
34
|
case constants_1.SYSTEM_MODE.OFF:
|
|
36
35
|
case constants_1.SYSTEM_MODE.FAN_ONLY:
|
|
37
36
|
return this.Characteristic.TargetHeatingCoolingState.OFF;
|
|
@@ -42,15 +41,15 @@ class TargetACState extends characteristics_base_1.ThermostatCharacteristicWrapp
|
|
|
42
41
|
case constants_1.SYSTEM_MODE.AUTO:
|
|
43
42
|
return this.Characteristic.TargetHeatingCoolingState.AUTO;
|
|
44
43
|
default:
|
|
45
|
-
this.log.error(`Unknown target state '${
|
|
44
|
+
this.log.error(`Unknown target state '${data}'. Report bug: https://bit.ly/3igbU7D`);
|
|
46
45
|
return this.Characteristic.TargetHeatingCoolingState.OFF;
|
|
47
46
|
}
|
|
48
|
-
};
|
|
47
|
+
}));
|
|
49
48
|
this.set = async (value) => {
|
|
50
49
|
switch (value) {
|
|
51
50
|
case this.Characteristic.TargetHeatingCoolingState.OFF: {
|
|
52
51
|
// If manual fan is set, go to fan only mode
|
|
53
|
-
if (await this.system.config.
|
|
52
|
+
if (await (0, rxjs_1.firstValueFrom)(this.system.config.getZone(this.context.zone).fan) !== constants_1.FAN_MODE.OFF) {
|
|
54
53
|
return await this.system.config.setMode(constants_1.SYSTEM_MODE.FAN_ONLY);
|
|
55
54
|
// If no manual fan, go to full off
|
|
56
55
|
}
|
|
@@ -75,31 +74,38 @@ class DisplayUnits extends characteristics_base_1.ThermostatCharacteristicWrappe
|
|
|
75
74
|
constructor() {
|
|
76
75
|
super(...arguments);
|
|
77
76
|
this.ctype = this.Characteristic.TemperatureDisplayUnits;
|
|
78
|
-
this.
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
this.Characteristic.TemperatureDisplayUnits.CELSIUS;
|
|
82
|
-
};
|
|
77
|
+
this.value = this.system.config.temp_units.pipe((0, rxjs_1.map)(data => data === 'F' ?
|
|
78
|
+
this.Characteristic.TemperatureDisplayUnits.FAHRENHEIT :
|
|
79
|
+
this.Characteristic.TemperatureDisplayUnits.CELSIUS));
|
|
83
80
|
}
|
|
84
81
|
}
|
|
85
82
|
class CurrentTemp extends characteristics_base_1.ThermostatCharacteristicWrapper {
|
|
86
83
|
constructor() {
|
|
87
84
|
super(...arguments);
|
|
88
85
|
this.ctype = this.Characteristic.CurrentTemperature;
|
|
89
|
-
this.
|
|
90
|
-
return (0, helpers_1.convertSystemTemp2CharTemp)(
|
|
91
|
-
};
|
|
86
|
+
this.value = this.system.status.getZone(this.context.zone).temp.pipe((0, rxjs_1.map)(([temp, temp_unit]) => {
|
|
87
|
+
return (0, helpers_1.convertSystemTemp2CharTemp)(temp, temp_unit);
|
|
88
|
+
}));
|
|
92
89
|
}
|
|
93
90
|
}
|
|
94
91
|
class CoolSetpoint extends characteristics_base_1.ThermostatCharacteristicWrapper {
|
|
95
92
|
constructor() {
|
|
96
93
|
super(...arguments);
|
|
97
94
|
this.ctype = this.Characteristic.CoolingThresholdTemperature;
|
|
98
|
-
this.
|
|
99
|
-
return
|
|
100
|
-
|
|
95
|
+
this.props = this.system.config.temp_bounds.pipe((0, rxjs_1.map)(data => {
|
|
96
|
+
return {
|
|
97
|
+
minValue: Number((0, helpers_1.convertSystemTemp2CharTemp)(data[0][0], data[0][1])),
|
|
98
|
+
maxValue: Number((0, helpers_1.convertSystemTemp2CharTemp)(data[1][0], data[1][1])),
|
|
99
|
+
};
|
|
100
|
+
}));
|
|
101
|
+
this.value = this.system.config.getZone(this.context.zone).cool_setpoint.pipe((0, rxjs_1.map)(([temp, temp_unit]) => (0, helpers_1.convertSystemTemp2CharTemp)(temp, temp_unit)));
|
|
101
102
|
this.set = async (value) => {
|
|
102
|
-
|
|
103
|
+
// Sync current activity settings to manual activity
|
|
104
|
+
await this.system.config.setZoneActivityManualSync(this.context.zone, await (0, rxjs_1.firstValueFrom)(this.system.getZoneActivity(this.context.zone)));
|
|
105
|
+
// Update manual activity
|
|
106
|
+
await this.system.config.setZoneActivityManualSetpoints(this.context.zone, (0, helpers_1.convertCharTemp2SystemTemp)(value, await (0, rxjs_1.firstValueFrom)(this.system.config.temp_units)), null);
|
|
107
|
+
// Enable manual activity hold
|
|
108
|
+
await this.system.config.setZoneActivityHold(this.context.zone, constants_1.ACTIVITY.MANUAL, await this.getHoldTime());
|
|
103
109
|
};
|
|
104
110
|
}
|
|
105
111
|
}
|
|
@@ -107,12 +113,20 @@ class HeatSetpoint extends characteristics_base_1.ThermostatCharacteristicWrappe
|
|
|
107
113
|
constructor() {
|
|
108
114
|
super(...arguments);
|
|
109
115
|
this.ctype = this.Characteristic.HeatingThresholdTemperature;
|
|
110
|
-
this.
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
116
|
+
this.props = this.system.config.temp_bounds.pipe((0, rxjs_1.map)(data => {
|
|
117
|
+
return {
|
|
118
|
+
minValue: Number((0, helpers_1.convertSystemTemp2CharTemp)(data[0][0], data[0][1])),
|
|
119
|
+
maxValue: Number((0, helpers_1.convertSystemTemp2CharTemp)(data[1][0], data[1][1])),
|
|
120
|
+
};
|
|
121
|
+
}));
|
|
122
|
+
this.value = this.system.config.getZone(this.context.zone).heat_setpoint.pipe((0, rxjs_1.map)(([temp, temp_unit]) => (0, helpers_1.convertSystemTemp2CharTemp)(temp, temp_unit)));
|
|
114
123
|
this.set = async (value) => {
|
|
115
|
-
|
|
124
|
+
// Sync current activity settings to manual activity
|
|
125
|
+
await this.system.config.setZoneActivityManualSync(this.context.zone, await (0, rxjs_1.firstValueFrom)(this.system.getZoneActivity(this.context.zone)));
|
|
126
|
+
// Update manual activity
|
|
127
|
+
await this.system.config.setZoneActivityManualSetpoints(this.context.zone, null, (0, helpers_1.convertCharTemp2SystemTemp)(value, await (0, rxjs_1.firstValueFrom)(this.system.config.temp_units)));
|
|
128
|
+
// Enable manual activity hold
|
|
129
|
+
await this.system.config.setZoneActivityHold(this.context.zone, constants_1.ACTIVITY.MANUAL, await this.getHoldTime());
|
|
116
130
|
};
|
|
117
131
|
}
|
|
118
132
|
}
|
|
@@ -124,34 +138,48 @@ class GeneralSetpoint extends characteristics_base_1.ThermostatCharacteristicWra
|
|
|
124
138
|
* system mode (i.e. heat or cool, not auto).
|
|
125
139
|
*/
|
|
126
140
|
this.ctype = this.Characteristic.TargetTemperature;
|
|
127
|
-
this.
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
141
|
+
this.props = this.system.config.temp_bounds.pipe((0, rxjs_1.map)(data => {
|
|
142
|
+
return {
|
|
143
|
+
minValue: Number((0, helpers_1.convertSystemTemp2CharTemp)(data[0][0], data[0][1])),
|
|
144
|
+
maxValue: Number((0, helpers_1.convertSystemTemp2CharTemp)(data[1][0], data[1][1])),
|
|
145
|
+
};
|
|
146
|
+
}));
|
|
147
|
+
this.value = (0, rxjs_1.combineLatest)([
|
|
148
|
+
this.system.config.mode,
|
|
149
|
+
this.system.config.getZone(this.context.zone).cool_setpoint,
|
|
150
|
+
this.system.config.getZone(this.context.zone).heat_setpoint,
|
|
151
|
+
]).pipe((0, rxjs_1.debounceTime)(50), (0, rxjs_1.map)(([c_mode, c_cool_setpoint, c_heat_setpoint]) => {
|
|
152
|
+
switch (c_mode) {
|
|
131
153
|
case constants_1.SYSTEM_MODE.COOL:
|
|
132
|
-
return (0, helpers_1.convertSystemTemp2CharTemp)(
|
|
154
|
+
return (0, helpers_1.convertSystemTemp2CharTemp)(c_cool_setpoint[0], c_cool_setpoint[1]);
|
|
133
155
|
case constants_1.SYSTEM_MODE.HEAT:
|
|
134
|
-
return (0, helpers_1.convertSystemTemp2CharTemp)(
|
|
156
|
+
return (0, helpers_1.convertSystemTemp2CharTemp)(c_heat_setpoint[0], c_heat_setpoint[1]);
|
|
135
157
|
default:
|
|
136
|
-
return (0, helpers_1.convertSystemTemp2CharTemp)((
|
|
137
|
-
await this.system.config.getZoneActivityHeatSetpoint(this.context.zone, activity)) / 2, await this.system.config.getUnits());
|
|
158
|
+
return (0, helpers_1.convertSystemTemp2CharTemp)((c_cool_setpoint[0] + c_heat_setpoint[0]) / 2, c_cool_setpoint[1]);
|
|
138
159
|
}
|
|
139
|
-
};
|
|
160
|
+
}), (0, rxjs_1.distinctUntilChanged)());
|
|
140
161
|
this.set = async (value) => {
|
|
141
|
-
|
|
142
|
-
|
|
162
|
+
// Sync current activity settings to manual activity
|
|
163
|
+
await this.system.config.setZoneActivityManualSync(this.context.zone, await (0, rxjs_1.firstValueFrom)(this.system.getZoneActivity(this.context.zone)));
|
|
164
|
+
// Update manual activity
|
|
165
|
+
const svalue = (0, helpers_1.convertCharTemp2SystemTemp)(value, await (0, rxjs_1.firstValueFrom)(this.system.config.temp_units));
|
|
166
|
+
const mode = await (0, rxjs_1.firstValueFrom)(this.system.config.mode);
|
|
143
167
|
switch (mode) {
|
|
144
168
|
case constants_1.SYSTEM_MODE.COOL:
|
|
145
|
-
|
|
169
|
+
await this.system.config.setZoneActivityManualSetpoints(this.context.zone, svalue, null);
|
|
170
|
+
break;
|
|
146
171
|
case constants_1.SYSTEM_MODE.HEAT:
|
|
147
|
-
|
|
172
|
+
await this.system.config.setZoneActivityManualSetpoints(this.context.zone, null, svalue);
|
|
173
|
+
break;
|
|
148
174
|
case constants_1.SYSTEM_MODE.AUTO:
|
|
149
175
|
// For auto mode, Cool/Heat setpoints are used
|
|
150
|
-
|
|
176
|
+
break;
|
|
151
177
|
default:
|
|
152
178
|
this.log.error(`Don't know how to set target temp for mode '${mode}'. Report bug: https://bit.ly/3igbU7D`);
|
|
153
179
|
throw new this.platform.api.hap.HapStatusError(-70410 /* this.platform.api.hap.HAPStatus.INVALID_VALUE_IN_REQUEST */);
|
|
154
180
|
}
|
|
181
|
+
// Enable manual activity hold
|
|
182
|
+
await this.system.config.setZoneActivityHold(this.context.zone, constants_1.ACTIVITY.MANUAL, await this.getHoldTime());
|
|
155
183
|
};
|
|
156
184
|
}
|
|
157
185
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"characteristics_ac.js","sourceRoot":"","sources":["../src/characteristics_ac.ts"],"names":[],"mappings":";;;AACA,iEAAuF;AACvF,uCAAmF;AACnF,+
|
|
1
|
+
{"version":3,"file":"characteristics_ac.js","sourceRoot":"","sources":["../src/characteristics_ac.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { SystemModel } from './api/models';
|
|
|
2
2
|
import { Service, Characteristic, Logger } from 'homebridge';
|
|
3
3
|
import { CharacteristicValue, UnknownContext, WithUUID } from 'homebridge';
|
|
4
4
|
import { CarrierInfinityHomebridgePlatform } from './platform';
|
|
5
|
+
import { Observable } from 'rxjs';
|
|
5
6
|
declare class Wrapper {
|
|
6
7
|
readonly platform: CarrierInfinityHomebridgePlatform;
|
|
7
8
|
protected readonly context: UnknownContext;
|
|
@@ -18,18 +19,20 @@ export declare abstract class MultiWrapper extends Wrapper {
|
|
|
18
19
|
}
|
|
19
20
|
export declare abstract class CharacteristicWrapper extends Wrapper {
|
|
20
21
|
abstract ctype: WithUUID<new () => Characteristic>;
|
|
21
|
-
protected props: {};
|
|
22
|
-
protected get: (() => Promise<CharacteristicValue>) | undefined;
|
|
23
22
|
protected set: ((value: CharacteristicValue) => Promise<void>) | undefined;
|
|
24
|
-
protected
|
|
23
|
+
protected abstract value: Observable<CharacteristicValue>;
|
|
24
|
+
protected props?: Observable<object>;
|
|
25
25
|
wrap(service: Service): void;
|
|
26
26
|
}
|
|
27
27
|
export declare abstract class ThermostatCharacteristicWrapper extends CharacteristicWrapper {
|
|
28
|
-
getActivity(): Promise<string>;
|
|
29
28
|
getHoldTime(): Promise<string>;
|
|
30
29
|
}
|
|
31
|
-
|
|
32
|
-
|
|
30
|
+
declare class AccessorySerial extends CharacteristicWrapper {
|
|
31
|
+
ctype: typeof import("hap-nodejs/dist/lib/definitions").SerialNumber;
|
|
32
|
+
value: Observable<string>;
|
|
33
|
+
}
|
|
34
|
+
export declare class AccessoryInformation extends MultiWrapper {
|
|
35
|
+
WRAPPERS: (typeof AccessorySerial)[];
|
|
33
36
|
}
|
|
34
37
|
export {};
|
|
35
38
|
//# sourceMappingURL=characteristics_base.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"characteristics_base.d.ts","sourceRoot":"","sources":["../src/characteristics_base.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"characteristics_base.d.ts","sourceRoot":"","sources":["../src/characteristics_base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,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;AAG/D,OAAO,EAAuB,UAAU,EAAM,MAAM,MAAM,CAAC;AAK3D,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,WAAW,CAAoD;IAC1F,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,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC;IAE3E,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,mBAAmB,CAAC,CAAC;IAC1D,SAAS,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAErC,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAmC7B;AAED,8BAAsB,+BAAgC,SAAQ,qBAAqB;IAG3E,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;CAqBrC;AAED,cAAM,eAAgB,SAAQ,qBAAqB;IACjD,KAAK,gEAAoC;IACzC,KAAK,qBAAgC;CACtC;AAYD,qBAAa,oBAAqB,SAAQ,YAAY;IACpD,QAAQ,6BAIN;CACH"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AccessoryInformation = exports.ThermostatCharacteristicWrapper = exports.CharacteristicWrapper = exports.MultiWrapper = void 0;
|
|
4
|
-
const constants_1 = require("./api/constants");
|
|
5
4
|
const helper_logging_1 = require("./helper_logging");
|
|
5
|
+
const rxjs_1 = require("rxjs");
|
|
6
6
|
/*
|
|
7
7
|
* Helpers to add handlers to the HAP Service and Characteristic objects.
|
|
8
8
|
*/
|
|
@@ -33,30 +33,36 @@ class MultiWrapper extends Wrapper {
|
|
|
33
33
|
}
|
|
34
34
|
exports.MultiWrapper = MultiWrapper;
|
|
35
35
|
class CharacteristicWrapper extends Wrapper {
|
|
36
|
-
constructor() {
|
|
37
|
-
super(...arguments);
|
|
38
|
-
this.props = {};
|
|
39
|
-
// used exclusively if no char value is set yet (first accessory load)
|
|
40
|
-
this.default_value = null;
|
|
41
|
-
}
|
|
42
36
|
wrap(service) {
|
|
43
37
|
const characteristic = service.getCharacteristic(this.ctype);
|
|
44
38
|
if (this.props) {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
if (this.get) {
|
|
48
|
-
characteristic.onGet(async () => {
|
|
49
|
-
// schedule characteristic update
|
|
50
|
-
setImmediate(async () => {
|
|
51
|
-
if (this.get) {
|
|
52
|
-
characteristic.updateValue(await this.get());
|
|
53
|
-
}
|
|
54
|
-
});
|
|
55
|
-
// and return immediately
|
|
56
|
-
// try 1) existing value, if falsy, 2) default value, if null, 3) keep existing value
|
|
57
|
-
return characteristic.value || this.default_value || characteristic.value;
|
|
39
|
+
this.props.subscribe(async (data) => {
|
|
40
|
+
characteristic.setProps(data);
|
|
58
41
|
});
|
|
59
42
|
}
|
|
43
|
+
// Push updates from the system-based value observable to HK
|
|
44
|
+
this.value.subscribe(async (data) => {
|
|
45
|
+
if (characteristic.value === data) {
|
|
46
|
+
this.log.debug(`PUSH (unnecessary) Updating ${this.ctype.name} from ${characteristic.value} to ${data}`);
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
this.log.debug(`PUSH Updating ${this.ctype.name} from ${characteristic.value} to ${data}`);
|
|
50
|
+
}
|
|
51
|
+
characteristic.updateValue(data);
|
|
52
|
+
});
|
|
53
|
+
// Make HK get requests initiate an observable update
|
|
54
|
+
characteristic.onGet(async () => {
|
|
55
|
+
// Tell the system model it should update ...
|
|
56
|
+
this.system.status.events.emit('onGet');
|
|
57
|
+
this.system.config.events.emit('onGet');
|
|
58
|
+
// ... and return immediately the last seen api value.
|
|
59
|
+
const data = await (0, rxjs_1.firstValueFrom)(this.value);
|
|
60
|
+
if (characteristic.value !== data) {
|
|
61
|
+
this.log.debug(`GET Updating ${this.ctype.name} from ${characteristic.value} to ${data}`);
|
|
62
|
+
}
|
|
63
|
+
return data;
|
|
64
|
+
});
|
|
65
|
+
// Sets call set helper which calls system model
|
|
60
66
|
if (this.set) {
|
|
61
67
|
characteristic.onSet(this.set.bind(this));
|
|
62
68
|
}
|
|
@@ -65,19 +71,11 @@ class CharacteristicWrapper extends Wrapper {
|
|
|
65
71
|
exports.CharacteristicWrapper = CharacteristicWrapper;
|
|
66
72
|
class ThermostatCharacteristicWrapper extends CharacteristicWrapper {
|
|
67
73
|
// TODO: check in constructor that context has zone and hold settings
|
|
68
|
-
async getActivity() {
|
|
69
|
-
// Vacation scheduling is weird, and changes infrequently. Just get it from status.
|
|
70
|
-
if (await this.system.status.getZoneActivity(this.context.zone) === constants_1.ACTIVITY.VACATION) {
|
|
71
|
-
return constants_1.ACTIVITY.VACATION;
|
|
72
|
-
}
|
|
73
|
-
// Config has more up to date activity settings.
|
|
74
|
-
return await this.system.config.getZoneActivity(this.context.zone);
|
|
75
|
-
}
|
|
76
74
|
async getHoldTime() {
|
|
77
75
|
// OTMR setting to say when manual hold should end
|
|
78
76
|
switch (this.context.holdBehavior) {
|
|
79
77
|
case 'activity':
|
|
80
|
-
return
|
|
78
|
+
return (0, rxjs_1.firstValueFrom)(this.system.config.getZone(this.context.zone).next_activity_time);
|
|
81
79
|
case 'for_x': {
|
|
82
80
|
const arg = this.context.holdArgument.split(':');
|
|
83
81
|
let target_ms = (new Date()).getTime();
|
|
@@ -96,14 +94,35 @@ class ThermostatCharacteristicWrapper extends CharacteristicWrapper {
|
|
|
96
94
|
}
|
|
97
95
|
}
|
|
98
96
|
exports.ThermostatCharacteristicWrapper = ThermostatCharacteristicWrapper;
|
|
99
|
-
class
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
97
|
+
class AccessorySerial extends CharacteristicWrapper {
|
|
98
|
+
constructor() {
|
|
99
|
+
super(...arguments);
|
|
100
|
+
this.ctype = this.Characteristic.SerialNumber;
|
|
101
|
+
this.value = (0, rxjs_1.of)(this.system.serialNumber);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
class AccessoryModel extends CharacteristicWrapper {
|
|
105
|
+
constructor() {
|
|
106
|
+
super(...arguments);
|
|
107
|
+
this.ctype = this.Characteristic.Model;
|
|
108
|
+
this.value = this.system.profile.model;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
class AccessoryManufacturer extends CharacteristicWrapper {
|
|
112
|
+
constructor() {
|
|
113
|
+
super(...arguments);
|
|
114
|
+
this.ctype = this.Characteristic.Manufacturer;
|
|
115
|
+
this.value = this.system.profile.brand.pipe((0, rxjs_1.map)(x => `${x} Home`));
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
class AccessoryInformation extends MultiWrapper {
|
|
119
|
+
constructor() {
|
|
120
|
+
super(...arguments);
|
|
121
|
+
this.WRAPPERS = [
|
|
122
|
+
AccessorySerial,
|
|
123
|
+
AccessoryModel,
|
|
124
|
+
AccessoryManufacturer,
|
|
125
|
+
];
|
|
107
126
|
}
|
|
108
127
|
}
|
|
109
128
|
exports.AccessoryInformation = AccessoryInformation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"characteristics_base.js","sourceRoot":"","sources":["../src/characteristics_base.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"characteristics_base.js","sourceRoot":"","sources":["../src/characteristics_base.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,26 +2,26 @@ import { CharacteristicValue } from 'homebridge';
|
|
|
2
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
|
+
value: import("rxjs").Observable<0 | 1>;
|
|
6
6
|
set: (value: CharacteristicValue) => Promise<void>;
|
|
7
7
|
}
|
|
8
8
|
declare class FanState extends ThermostatCharacteristicWrapper {
|
|
9
9
|
ctype: typeof import("hap-nodejs/dist/lib/definitions").CurrentFanState;
|
|
10
|
-
|
|
10
|
+
value: import("rxjs").Observable<0 | 2 | 1>;
|
|
11
11
|
}
|
|
12
12
|
declare class FanSpeed extends ThermostatCharacteristicWrapper {
|
|
13
13
|
ctype: typeof import("hap-nodejs/dist/lib/definitions").RotationSpeed;
|
|
14
|
-
props: {
|
|
14
|
+
props: import("rxjs").Observable<{
|
|
15
15
|
minValue: number;
|
|
16
16
|
maxValue: number;
|
|
17
17
|
minStep: number;
|
|
18
|
-
}
|
|
19
|
-
|
|
18
|
+
}>;
|
|
19
|
+
value: import("rxjs").Observable<CharacteristicValue>;
|
|
20
20
|
set: (value: CharacteristicValue) => Promise<void>;
|
|
21
21
|
}
|
|
22
22
|
declare class TargetFanState extends ThermostatCharacteristicWrapper {
|
|
23
23
|
ctype: typeof import("hap-nodejs/dist/lib/definitions").TargetFanState;
|
|
24
|
-
|
|
24
|
+
value: import("rxjs").Observable<0 | 1>;
|
|
25
25
|
set: (value: CharacteristicValue) => Promise<void>;
|
|
26
26
|
}
|
|
27
27
|
export declare class FanService extends MultiWrapper {
|