homebridge-carrier-infinity 1.5.4 → 1.5.7

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.
Files changed (30) hide show
  1. package/SECURITY.md +9 -0
  2. package/dist/accessory_envsensor.d.ts.map +1 -1
  3. package/dist/accessory_envsensor.js +2 -3
  4. package/dist/accessory_envsensor.js.map +1 -1
  5. package/dist/accessory_oat.d.ts.map +1 -1
  6. package/dist/accessory_oat.js +2 -3
  7. package/dist/accessory_oat.js.map +1 -1
  8. package/dist/base.d.ts +6 -4
  9. package/dist/base.d.ts.map +1 -1
  10. package/dist/base.js +17 -7
  11. package/dist/base.js.map +1 -1
  12. package/dist/characteristics_ac.d.ts +2 -1
  13. package/dist/characteristics_ac.d.ts.map +1 -1
  14. package/dist/characteristics_ac.js +59 -0
  15. package/dist/characteristics_ac.js.map +1 -1
  16. package/dist/characteristics_humidity.d.ts.map +1 -1
  17. package/dist/characteristics_humidity.js.map +1 -1
  18. package/dist/infinityApi.d.ts +12 -4
  19. package/dist/infinityApi.d.ts.map +1 -1
  20. package/dist/infinityApi.js +123 -49
  21. package/dist/infinityApi.js.map +1 -1
  22. package/dist/platform.js +1 -1
  23. package/dist/platform.js.map +1 -1
  24. package/dist/platformAccessory.d.ts +1 -1
  25. package/dist/platformAccessory.d.ts.map +1 -1
  26. package/dist/platformAccessory.js +8 -57
  27. package/dist/platformAccessory.js.map +1 -1
  28. package/dist/settings.d.ts +1 -1
  29. package/dist/settings.js +1 -1
  30. package/package.json +16 -13
package/SECURITY.md ADDED
@@ -0,0 +1,9 @@
1
+ # Security Policy
2
+
3
+ ## Supported Versions
4
+
5
+ Only the npm versions of 'homebridge-carrier-infinity' tagged '@latest' and '@next' are supported.
6
+
7
+ ## Reporting a Vulnerability
8
+
9
+ Please report suspected security issues to [security@ghr.email](mailto:security@ghr.email) with [SECURITY] in the subject line.
package/dist/accessory_envsensor.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"accessory_envsensor.d.ts","sourceRoot":"","sources":["../src/accessory_envsensor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAI/D,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBADT,QAAQ,EAAE,iCAAiC,EAC3C,SAAS,EAAE,iBAAiB;CAsBhD"}
1
+ {"version":3,"file":"accessory_envsensor.d.ts","sourceRoot":"","sources":["../src/accessory_envsensor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAI/D,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBADT,QAAQ,EAAE,iCAAiC,EAC3C,SAAS,EAAE,iBAAiB;CAmBhD"}
package/dist/accessory_envsensor.js CHANGED
@@ -7,10 +7,9 @@ class EnvSensorAccessory {
7
7
  constructor(platform, accessory) {
8
8
  this.platform = platform;
9
9
  this.accessory = accessory;
10
- const system = this.platform.systems[this.accessory.context.serialNumber];
11
- new characteristics_humidity_1.ThermostatRHService(this.platform.api, system, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.HumiditySensor) ||
10
+ new characteristics_humidity_1.ThermostatRHService(this.platform, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.HumiditySensor) ||
12
11
  this.accessory.addService(this.platform.Service.HumiditySensor));
13
- new base_1.AccessoryInformation(this.platform.api, system, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.AccessoryInformation) ||
12
+ new base_1.AccessoryInformation(this.platform, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.AccessoryInformation) ||
14
13
  this.accessory.addService(this.platform.Service.AccessoryInformation));
15
14
  }
16
15
  }
package/dist/accessory_envsensor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"accessory_envsensor.js","sourceRoot":"","sources":["../src/accessory_envsensor.ts"],"names":[],"mappings":";;;AAEA,iCAA8C;AAC9C,yEAAiE;AAEjE,MAAa,kBAAkB;IAC7B,YACmB,QAA2C,EAC3C,SAA4B;QAD5B,aAAQ,GAAR,QAAQ,CAAmC;QAC3C,cAAS,GAAT,SAAS,CAAmB;QAE7C,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC1E,IAAI,8CAAmB,CACrB,IAAI,CAAC,QAAQ,CAAC,GAAG,EACjB,MAAM,EACN,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,2BAAoB,CACtB,IAAI,CAAC,QAAQ,CAAC,GAAG,EACjB,MAAM,EACN,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;AAzBD,gDAyBC"}
1
+ {"version":3,"file":"accessory_envsensor.js","sourceRoot":"","sources":["../src/accessory_envsensor.ts"],"names":[],"mappings":";;;AAEA,iCAA8C;AAC9C,yEAAiE;AAEjE,MAAa,kBAAkB;IAC7B,YACmB,QAA2C,EAC3C,SAA4B;QAD5B,aAAQ,GAAR,QAAQ,CAAmC;QAC3C,cAAS,GAAT,SAAS,CAAmB;QAE7C,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,2BAAoB,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;AAtBD,gDAsBC"}
package/dist/accessory_oat.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"accessory_oat.d.ts","sourceRoot":"","sources":["../src/accessory_oat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAwB,qBAAqB,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGnF,cAAM,aAAc,SAAQ,qBAAqB;IAC/C,KAAK,sEAA0C;IAC/C,GAAG,0DAKD;CACH;AAED,qBAAa,wBAAyB,SAAQ,YAAY;IACxD,QAAQ,2BAAmB;CAC5B;AAED,qBAAa,2BAA2B;IAEpC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBADT,QAAQ,EAAE,iCAAiC,EAC3C,SAAS,EAAE,iBAAiB;CAsBhD"}
1
+ {"version":3,"file":"accessory_oat.d.ts","sourceRoot":"","sources":["../src/accessory_oat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAwB,qBAAqB,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGnF,cAAM,aAAc,SAAQ,qBAAqB;IAC/C,KAAK,sEAA0C;IAC/C,GAAG,0DAKD;CACH;AAED,qBAAa,wBAAyB,SAAQ,YAAY;IACxD,QAAQ,2BAAmB;CAC5B;AAED,qBAAa,2BAA2B;IAEpC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBADT,QAAQ,EAAE,iCAAiC,EAC3C,SAAS,EAAE,iBAAiB;CAmBhD"}
package/dist/accessory_oat.js CHANGED
@@ -23,10 +23,9 @@ class OutdoorTemperatureAccessory {
23
23
  constructor(platform, accessory) {
24
24
  this.platform = platform;
25
25
  this.accessory = accessory;
26
- const system = this.platform.systems[this.accessory.context.serialNumber];
27
- new OutdoorTempSensorService(this.platform.api, system, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.TemperatureSensor) ||
26
+ new OutdoorTempSensorService(this.platform, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.TemperatureSensor) ||
28
27
  this.accessory.addService(this.platform.Service.TemperatureSensor));
29
- new base_1.AccessoryInformation(this.platform.api, system, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.AccessoryInformation) ||
28
+ new base_1.AccessoryInformation(this.platform, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.AccessoryInformation) ||
30
29
  this.accessory.addService(this.platform.Service.AccessoryInformation));
31
30
  }
32
31
  }
package/dist/accessory_oat.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"accessory_oat.js","sourceRoot":"","sources":["../src/accessory_oat.ts"],"names":[],"mappings":";;;AAEA,iCAAmF;AACnF,uCAAuD;AAEvD,MAAM,aAAc,SAAQ,4BAAqB;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,mBAAY;IAA1D;;QACE,aAAQ,GAAG,CAAC,aAAa,CAAC,CAAC;IAC7B,CAAC;CAAA;AAFD,4DAEC;AAED,MAAa,2BAA2B;IACtC,YACmB,QAA2C,EAC3C,SAA4B;QAD5B,aAAQ,GAAR,QAAQ,CAAmC;QAC3C,cAAS,GAAT,SAAS,CAAmB;QAE7C,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC1E,IAAI,wBAAwB,CAC1B,IAAI,CAAC,QAAQ,CAAC,GAAG,EACjB,MAAM,EACN,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,2BAAoB,CACtB,IAAI,CAAC,QAAQ,CAAC,GAAG,EACjB,MAAM,EACN,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;AAzBD,kEAyBC"}
1
+ {"version":3,"file":"accessory_oat.js","sourceRoot":"","sources":["../src/accessory_oat.ts"],"names":[],"mappings":";;;AAEA,iCAAmF;AACnF,uCAAuD;AAEvD,MAAM,aAAc,SAAQ,4BAAqB;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,mBAAY;IAA1D;;QACE,aAAQ,GAAG,CAAC,aAAa,CAAC,CAAC;IAC7B,CAAC;CAAA;AAFD,4DAEC;AAED,MAAa,2BAA2B;IACtC,YACmB,QAA2C,EAC3C,SAA4B;QAD5B,aAAQ,GAAR,QAAQ,CAAmC;QAC3C,cAAS,GAAT,SAAS,CAAmB;QAE7C,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,2BAAoB,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;AAtBD,kEAsBC"}
package/dist/base.d.ts CHANGED
@@ -1,13 +1,15 @@
1
1
  import { InfinityEvolutionSystemModel } from './infinityApi';
2
- import { API, Service, Characteristic } from 'homebridge';
2
+ import { Service, Characteristic, Logger } from 'homebridge';
3
3
  import { CharacteristicValue, UnknownContext, WithUUID } from 'homebridge';
4
+ import { CarrierInfinityHomebridgePlatform } from './platform';
4
5
  declare class Wrapper {
5
- readonly api: API;
6
- protected readonly system: InfinityEvolutionSystemModel;
6
+ readonly platform: CarrierInfinityHomebridgePlatform;
7
7
  protected readonly context: UnknownContext;
8
8
  readonly Service: typeof Service;
9
9
  readonly Characteristic: typeof Characteristic;
10
- constructor(api: API, system: InfinityEvolutionSystemModel, context: UnknownContext);
10
+ protected readonly system: InfinityEvolutionSystemModel;
11
+ protected readonly log: Logger;
12
+ constructor(platform: CarrierInfinityHomebridgePlatform, context: UnknownContext);
11
13
  wrap(service: Service): void;
12
14
  }
13
15
  export declare abstract class MultiWrapper extends Wrapper {
package/dist/base.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,4BAA4B,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAM3E,cAAM,OAAO;aAKO,GAAG,EAAE,GAAG;IACxB,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,4BAA4B;IACvD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,cAAc;IAN5C,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAwB;IAC/D,SAAgB,cAAc,EAAE,OAAO,cAAc,CAA+B;gBAGlE,GAAG,EAAE,GAAG,EACL,MAAM,EAAE,4BAA4B,EACpC,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;CAS7B;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,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAY7B;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"}
1
+ {"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../src/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;AAM/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,CAAqB;gBAGjC,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,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAqB7B;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"}
package/dist/base.js CHANGED
@@ -6,12 +6,13 @@ const infinityApi_1 = require("./infinityApi");
6
6
  * Helpers to add handlers to the HAP Service and Characteristic objects.
7
7
  */
8
8
  class Wrapper {
9
- constructor(api, system, context) {
10
- this.api = api;
11
- this.system = system;
9
+ constructor(platform, context) {
10
+ this.platform = platform;
12
11
  this.context = context;
13
- this.Service = this.api.hap.Service;
14
- this.Characteristic = this.api.hap.Characteristic;
12
+ this.Service = this.platform.api.hap.Service;
13
+ this.Characteristic = this.platform.api.hap.Characteristic;
14
+ this.system = this.platform.systems[this.context.serialNumber];
15
+ this.log = this.platform.log;
15
16
  }
16
17
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
17
18
  wrap(service) {
@@ -25,7 +26,7 @@ class MultiWrapper extends Wrapper {
25
26
  }
26
27
  wrap(service) {
27
28
  for (const ctype of this.WRAPPERS) {
28
- new ctype(this.api, this.system, this.context).wrap(service);
29
+ new ctype(this.platform, this.context).wrap(service);
29
30
  }
30
31
  }
31
32
  }
@@ -41,7 +42,16 @@ class CharacteristicWrapper extends Wrapper {
41
42
  characteristic.setProps(this.props);
42
43
  }
43
44
  if (this.get) {
44
- characteristic.onGet(this.get.bind(this));
45
+ characteristic.onGet(async () => {
46
+ // schedule characteristic update
47
+ setImmediate(async () => {
48
+ if (this.get) {
49
+ characteristic.updateValue(await this.get());
50
+ }
51
+ });
52
+ // and return immediately
53
+ return characteristic.value;
54
+ });
45
55
  }
46
56
  if (this.set) {
47
57
  characteristic.onSet(this.set.bind(this));
package/dist/base.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"base.js","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"base.js","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"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"}
package/dist/characteristics_ac.d.ts CHANGED
@@ -1,7 +1,8 @@
1
+ import { CharacteristicValue } from 'homebridge';
1
2
  import { ThermostatCharacteristicWrapper, MultiWrapper } from './base';
2
3
  declare class CurrentTemp extends ThermostatCharacteristicWrapper {
3
4
  ctype: typeof import("hap-nodejs/dist/lib/definitions").CurrentTemperature;
4
- get: () => Promise<import("hap-nodejs").CharacteristicValue>;
5
+ get: () => Promise<CharacteristicValue>;
5
6
  }
6
7
  export declare class ACService extends MultiWrapper {
7
8
  WRAPPERS: (typeof CurrentTemp)[];
package/dist/characteristics_ac.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"characteristics_ac.d.ts","sourceRoot":"","sources":["../src/characteristics_ac.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAsBvE,cAAM,WAAY,SAAQ,+BAA+B;IACvD,KAAK,sEAA0C;IAC/C,GAAG,0DAKD;CACH;AAED,qBAAa,SAAU,SAAQ,YAAY;IACzC,QAAQ,yBAGN;CACH"}
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,QAAQ,CAAC;AA2EvE,cAAM,WAAY,SAAQ,+BAA+B;IACvD,KAAK,sEAA0C;IAC/C,GAAG,qCAKD;CACH;AAED,qBAAa,SAAU,SAAQ,YAAY;IACzC,QAAQ,yBAKN;CACH"}
package/dist/characteristics_ac.js CHANGED
@@ -19,11 +19,68 @@ 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(`Unknown current state '${current_state}'. Defaulting to off.`);
22
23
  return this.Characteristic.CurrentHeatingCoolingState.OFF;
23
24
  }
24
25
  };
25
26
  }
26
27
  }
28
+ class TargetACState extends base_1.ThermostatCharacteristicWrapper {
29
+ constructor() {
30
+ super(...arguments);
31
+ this.ctype = this.Characteristic.TargetHeatingCoolingState;
32
+ this.get = async () => {
33
+ const target_state = await this.system.config.getMode();
34
+ switch (target_state) {
35
+ case infinityApi_1.SYSTEM_MODE.OFF:
36
+ case infinityApi_1.SYSTEM_MODE.FAN_ONLY:
37
+ return this.Characteristic.TargetHeatingCoolingState.OFF;
38
+ case infinityApi_1.SYSTEM_MODE.COOL:
39
+ return this.Characteristic.TargetHeatingCoolingState.COOL;
40
+ case infinityApi_1.SYSTEM_MODE.HEAT:
41
+ return this.Characteristic.TargetHeatingCoolingState.HEAT;
42
+ case infinityApi_1.SYSTEM_MODE.AUTO:
43
+ return this.Characteristic.TargetHeatingCoolingState.AUTO;
44
+ default:
45
+ this.log.error(`Unknown target state '${target_state}'. Defaulting to off.`);
46
+ return this.Characteristic.TargetHeatingCoolingState.OFF;
47
+ }
48
+ };
49
+ this.set = async (value) => {
50
+ switch (value) {
51
+ case this.Characteristic.TargetHeatingCoolingState.OFF: {
52
+ // If manual fan is set, go to fan only mode
53
+ if (await this.system.config.getZoneActivityFan(this.context.zone, await this.getActivity()) !== infinityApi_1.FAN_MODE.OFF) {
54
+ return await this.system.config.setMode(infinityApi_1.SYSTEM_MODE.FAN_ONLY);
55
+ // If no manual fan, go to full off
56
+ }
57
+ else {
58
+ return await this.system.config.setMode(infinityApi_1.SYSTEM_MODE.OFF);
59
+ }
60
+ }
61
+ case this.Characteristic.TargetHeatingCoolingState.COOL:
62
+ return await this.system.config.setMode(infinityApi_1.SYSTEM_MODE.COOL);
63
+ case this.Characteristic.TargetHeatingCoolingState.HEAT:
64
+ return await this.system.config.setMode(infinityApi_1.SYSTEM_MODE.HEAT);
65
+ case this.Characteristic.TargetHeatingCoolingState.AUTO:
66
+ return await this.system.config.setMode(infinityApi_1.SYSTEM_MODE.AUTO);
67
+ default:
68
+ this.log.error(`Don't know how to set target state '${value}'. Making no change.`);
69
+ }
70
+ };
71
+ }
72
+ }
73
+ class DisplayUnits extends base_1.ThermostatCharacteristicWrapper {
74
+ constructor() {
75
+ super(...arguments);
76
+ this.ctype = this.Characteristic.CurrentTemperature;
77
+ this.get = async () => {
78
+ return await this.system.config.getUnits() === 'F' ?
79
+ this.Characteristic.TemperatureDisplayUnits.FAHRENHEIT :
80
+ this.Characteristic.TemperatureDisplayUnits.CELSIUS;
81
+ };
82
+ }
83
+ }
27
84
  class CurrentTemp extends base_1.ThermostatCharacteristicWrapper {
28
85
  constructor() {
29
86
  super(...arguments);
@@ -38,6 +95,8 @@ class ACService extends base_1.MultiWrapper {
38
95
  super(...arguments);
39
96
  this.WRAPPERS = [
40
97
  CurrentACStatus,
98
+ TargetACState,
99
+ DisplayUnits,
41
100
  CurrentTemp,
42
101
  ];
43
102
  }
package/dist/characteristics_ac.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"characteristics_ac.js","sourceRoot":"","sources":["../src/characteristics_ac.ts"],"names":[],"mappings":";;;AAAA,iCAAuE;AACvE,uCAAuD;AACvD,+CAA4C;AAE5C,MAAM,eAAgB,SAAQ,sCAA+B;IAA7D;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,0BAA0B,CAAC;QACvD,QAAG,GAAG,KAAK,IAAI,EAAE;YACf,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACtF,QAAO,aAAa,EAAE;gBACpB,KAAK,yBAAW,CAAC,GAAG,CAAC;gBACrB,KAAK,yBAAW,CAAC,QAAQ;oBACvB,OAAO,IAAI,CAAC,cAAc,CAAC,0BAA0B,CAAC,GAAG,CAAC;gBAC5D,KAAK,yBAAW,CAAC,IAAI;oBACnB,OAAO,IAAI,CAAC,cAAc,CAAC,0BAA0B,CAAC,IAAI,CAAC;gBAC7D,KAAK,yBAAW,CAAC,IAAI;oBACnB,OAAO,IAAI,CAAC,cAAc,CAAC,0BAA0B,CAAC,IAAI,CAAC;gBAC7D;oBACE,OAAO,IAAI,CAAC,cAAc,CAAC,0BAA0B,CAAC,GAAG,CAAC;aAC7D;QACH,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,MAAM,WAAY,SAAQ,sCAA+B;IAAzD;;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,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EACvD,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CACpC,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,MAAa,SAAU,SAAQ,mBAAY;IAA3C;;QACE,aAAQ,GAAG;YACT,eAAe;YACf,WAAW;SACZ,CAAC;IACJ,CAAC;CAAA;AALD,8BAKC"}
1
+ {"version":3,"file":"characteristics_ac.js","sourceRoot":"","sources":["../src/characteristics_ac.ts"],"names":[],"mappings":";;;AACA,iCAAuE;AACvE,uCAAuD;AACvD,+CAAsD;AAEtD,MAAM,eAAgB,SAAQ,sCAA+B;IAA7D;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,0BAA0B,CAAC;QACvD,QAAG,GAAG,KAAK,IAAI,EAAE;YACf,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACtF,QAAO,aAAa,EAAE;gBACpB,KAAK,yBAAW,CAAC,GAAG,CAAC;gBACrB,KAAK,yBAAW,CAAC,QAAQ;oBACvB,OAAO,IAAI,CAAC,cAAc,CAAC,0BAA0B,CAAC,GAAG,CAAC;gBAC5D,KAAK,yBAAW,CAAC,IAAI;oBACnB,OAAO,IAAI,CAAC,cAAc,CAAC,0BAA0B,CAAC,IAAI,CAAC;gBAC7D,KAAK,yBAAW,CAAC,IAAI;oBACnB,OAAO,IAAI,CAAC,cAAc,CAAC,0BAA0B,CAAC,IAAI,CAAC;gBAC7D;oBACE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,aAAa,uBAAuB,CAAC,CAAC;oBAC/E,OAAO,IAAI,CAAC,cAAc,CAAC,0BAA0B,CAAC,GAAG,CAAC;aAC7D;QACH,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,MAAM,aAAc,SAAQ,sCAA+B;IAA3D;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAAC;QACtD,QAAG,GAAG,KAAK,IAAI,EAAE;YACf,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACxD,QAAO,YAAY,EAAE;gBACnB,KAAK,yBAAW,CAAC,GAAG,CAAC;gBACrB,KAAK,yBAAW,CAAC,QAAQ;oBACvB,OAAO,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAAC,GAAG,CAAC;gBAC3D,KAAK,yBAAW,CAAC,IAAI;oBACnB,OAAO,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI,CAAC;gBAC5D,KAAK,yBAAW,CAAC,IAAI;oBACnB,OAAO,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI,CAAC;gBAC5D,KAAK,yBAAW,CAAC,IAAI;oBACnB,OAAO,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI,CAAC;gBAC5D;oBACE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,YAAY,uBAAuB,CAAC,CAAC;oBAC7E,OAAO,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAAC,GAAG,CAAC;aAC5D;QACH,CAAC,CAAC;QAEF,QAAG,GAAG,KAAK,EAAE,KAA0B,EAAE,EAAE;YACzC,QAAO,KAAK,EAAE;gBACZ,KAAK,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;oBACtD,4CAA4C;oBAC5C,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,sBAAQ,CAAC,GAAG,EAAE;wBAC7G,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,yBAAW,CAAC,QAAQ,CAAC,CAAC;wBAChE,mCAAmC;qBAClC;yBAAM;wBACL,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,yBAAW,CAAC,GAAG,CAAC,CAAC;qBAC1D;iBACF;gBACD,KAAK,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI;oBACrD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,yBAAW,CAAC,IAAI,CAAC,CAAC;gBAC5D,KAAK,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI;oBACrD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,yBAAW,CAAC,IAAI,CAAC,CAAC;gBAC5D,KAAK,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI;oBACrD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,yBAAW,CAAC,IAAI,CAAC,CAAC;gBAC5D;oBACE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uCAAuC,KAAK,sBAAsB,CAAC,CAAC;aACtF;QACH,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,MAAM,YAAa,SAAQ,sCAA+B;IAA1D;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC;QAC/C,QAAG,GAAG,KAAK,IAAI,EAAE;YACf,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,GAAG,CAAC,CAAC;gBAClD,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC;gBACxD,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC,OAAO,CAAC;QACxD,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,MAAM,WAAY,SAAQ,sCAA+B;IAAzD;;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,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EACvD,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CACpC,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,MAAa,SAAU,SAAQ,mBAAY;IAA3C;;QACE,aAAQ,GAAG;YACT,eAAe;YACf,aAAa;YACb,YAAY;YACZ,WAAW;SACZ,CAAC;IACJ,CAAC;CAAA;AAPD,8BAOC"}
package/dist/characteristics_humidity.d.ts.map CHANGED
@@ -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,QAAQ,CAAC;AAE7D,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;IAC/C,QAAQ,8BAIN;CACL"}
1
+ {"version":3,"file":"characteristics_humidity.d.ts","sourceRoot":"","sources":["../src/characteristics_humidity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAE7D,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.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"characteristics_humidity.js","sourceRoot":"","sources":["../src/characteristics_humidity.ts"],"names":[],"mappings":";;;AAAA,iCAA6D;AAE7D,MAAM,SAAU,SAAQ,4BAAqB;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,4BAAqB;IAApD;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,qCAAqC,CAAC;IACpE,CAAC;CAAA;AAED,MAAM,cAAe,SAAQ,4BAAqB;IAAlD;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,mCAAmC,CAAC;IAClE,CAAC;CAAA;AAGD,MAAa,mBAAoB,SAAQ,mBAAY;IAArD;;QACE,aAAQ,GAAG;YACT,SAAS;SACV,CAAC;IACJ,CAAC;CAAA;AAJD,kDAIC;AAED,MAAa,iBAAkB,SAAQ,mBAAY;IAAnD;;QACI,aAAQ,GAAG;YACT,SAAS;YACT,gBAAgB;YAChB,cAAc;SACf,CAAC;IACN,CAAC;CAAA;AAND,8CAMC"}
1
+ {"version":3,"file":"characteristics_humidity.js","sourceRoot":"","sources":["../src/characteristics_humidity.ts"],"names":[],"mappings":";;;AAAA,iCAA6D;AAE7D,MAAM,SAAU,SAAQ,4BAAqB;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,4BAAqB;IAApD;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,qCAAqC,CAAC;IACpE,CAAC;CAAA;AAED,MAAM,cAAe,SAAQ,4BAAqB;IAAlD;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,mCAAmC,CAAC;IAClE,CAAC;CAAA;AAGD,MAAa,mBAAoB,SAAQ,mBAAY;IAArD;;QACE,aAAQ,GAAG;YACT,SAAS;SACV,CAAC;IACJ,CAAC;CAAA;AAJD,kDAIC;AAED,MAAa,iBAAkB,SAAQ,mBAAY;IAAnD;;QACE,aAAQ,GAAG;YACT,SAAS;YACT,gBAAgB;YAChB,cAAc;SACf,CAAC;IACJ,CAAC;CAAA;AAND,8CAMC"}
package/dist/infinityApi.d.ts CHANGED
@@ -35,13 +35,14 @@ export declare class InfinityEvolutionApiConnection {
35
35
  declare abstract class BaseInfinityEvolutionApiModel {
36
36
  protected readonly api_connection: InfinityEvolutionApiConnection;
37
37
  protected data_object: any;
38
+ protected data_object_hash?: string;
39
+ protected HASH_IGNORE_KEYS: Set<string>;
38
40
  protected write_lock: Mutex;
39
41
  constructor(api_connection: InfinityEvolutionApiConnection);
40
42
  abstract getPath(): string;
43
+ protected hashDataObject(): string;
41
44
  fetch(): Promise<void>;
42
45
  protected forceFetch(): Promise<void>;
43
- push(): Promise<void>;
44
- private pushUnsafe;
45
46
  }
46
47
  export declare class InfinityEvolutionLocations extends BaseInfinityEvolutionApiModel {
47
48
  getPath(): string;
@@ -50,7 +51,8 @@ export declare class InfinityEvolutionLocations extends BaseInfinityEvolutionApi
50
51
  declare abstract class BaseInfinityEvolutionSystemApiModel extends BaseInfinityEvolutionApiModel {
51
52
  protected readonly api_connection: InfinityEvolutionApiConnection;
52
53
  readonly serialNumber: string;
53
- last_updated: number;
54
+ private last_updated;
55
+ protected HASH_IGNORE_KEYS: Set<string>;
54
56
  constructor(api_connection: InfinityEvolutionApiConnection, serialNumber: string);
55
57
  protected forceFetch(): Promise<void>;
56
58
  }
@@ -82,7 +84,6 @@ export declare class InfinityEvolutionSystemConfig extends BaseInfinityEvolution
82
84
  getUnits(): Promise<string>;
83
85
  getTempBounds(): Promise<[number, number]>;
84
86
  getMode(): Promise<string>;
85
- setMode(mode: string): Promise<void>;
86
87
  private getZone;
87
88
  getZoneName(zone: string): Promise<string>;
88
89
  getZoneActivity(zone: string): Promise<string>;
@@ -92,7 +93,14 @@ export declare class InfinityEvolutionSystemConfig extends BaseInfinityEvolution
92
93
  getZoneActivityHeatSetpoint(zone: string, activity: string): Promise<number>;
93
94
  getZoneNextActivityTime(zone: string): Promise<string>;
94
95
  private roundSetpoint;
96
+ mutations: (() => Promise<void>)[];
97
+ private push;
98
+ private mutate;
99
+ private forcePush;
100
+ setMode(mode: string): Promise<void>;
101
+ private mutateMode;
95
102
  setZoneActivity(zone: string, clsp: number | null, htsp: number | null, hold_until: string | null, fan?: string | null): Promise<void>;
103
+ private mutateZoneActivity;
96
104
  }
97
105
  export declare class InfinityEvolutionSystemModel {
98
106
  protected readonly api_connection: InfinityEvolutionApiConnection;
package/dist/infinityApi.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"infinityApi.d.ts","sourceRoot":"","sources":["../src/infinityApi.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"infinityApi.d.ts","sourceRoot":"","sources":["../src/infinityApi.ts"],"names":[],"mappings":"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"}
package/dist/infinityApi.js CHANGED
@@ -35,6 +35,7 @@ const oauth_signature_1 = __importDefault(require("oauth-signature"));
35
35
  const typescript_memoize_1 = require("typescript-memoize");
36
36
  const async_mutex_1 = require("async-mutex");
37
37
  const xml2js = __importStar(require("xml2js"));
38
+ const object_hash_1 = __importDefault(require("object-hash"));
38
39
  exports.SYSTEM_MODE = {
39
40
  OFF: 'off',
40
41
  COOL: 'cool',
@@ -91,6 +92,9 @@ class OAuthHeaders {
91
92
  return `OAuth ${header_params.join(',')}`;
92
93
  }
93
94
  static intercept(config, username, token) {
95
+ if (config.headers === undefined) {
96
+ config.headers = {};
97
+ }
94
98
  config.headers.Authorization = this.genHeader(config.method || 'GET', config.url || '/', username, token, config.data);
95
99
  return config;
96
100
  }
@@ -116,11 +120,14 @@ class InfinityEvolutionApiConnection {
116
120
  // TODO: on some api errors, force a refresh
117
121
  async forceRefreshToken() {
118
122
  var _a, _b;
119
- const loginxml = '<credentials>'
120
- + `<username>${this.username}</username>`
121
- + `<password>${this.password}</password>`
122
- + '</credentials>';
123
- const data = `data=${encodeURIComponent(loginxml)}`;
123
+ const builder = new xml2js.Builder({ cdata: true, headless: true });
124
+ const new_xml = builder.buildObject({
125
+ credentials: {
126
+ username: this.username,
127
+ password: this.password,
128
+ },
129
+ });
130
+ const data = `data=${encodeURIComponent(new_xml)}`;
124
131
  try {
125
132
  const response = await this.axios.post('/users/authenticated', data, {
126
133
  headers: {
@@ -155,19 +162,29 @@ exports.InfinityEvolutionApiConnection = InfinityEvolutionApiConnection;
155
162
  class BaseInfinityEvolutionApiModel {
156
163
  constructor(api_connection) {
157
164
  this.api_connection = api_connection;
158
- // TODO make unknown and handle type checking in getters
165
+ // TODO make unknown and handle type checking in get methods
159
166
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
160
167
  this.data_object = null;
168
+ this.HASH_IGNORE_KEYS = new Set();
161
169
  this.write_lock = new async_mutex_1.Mutex();
162
170
  }
171
+ hashDataObject() {
172
+ return (0, object_hash_1.default)(this.data_object, { excludeKeys: (key) => {
173
+ return this.HASH_IGNORE_KEYS.has(key);
174
+ } });
175
+ }
163
176
  async fetch() {
164
- await this.forceFetch();
177
+ // Don't fetch while writes are happening.
178
+ await this.write_lock.runExclusive(async () => {
179
+ await this.forceFetch();
180
+ });
165
181
  }
166
182
  async forceFetch() {
167
183
  await this.api_connection.refreshToken();
168
184
  try {
169
185
  const response = await this.api_connection.axios.get(this.getPath());
170
186
  this.data_object = await xml2js.parseStringPromise(response.data);
187
+ this.data_object_hash = this.hashDataObject();
171
188
  }
172
189
  catch (error) {
173
190
  if (axios_1.default.isAxiosError(error)) {
@@ -178,32 +195,6 @@ class BaseInfinityEvolutionApiModel {
178
195
  }
179
196
  }
180
197
  }
181
- async push() {
182
- await this.write_lock.runExclusive(async () => {
183
- await this.pushUnsafe();
184
- });
185
- }
186
- async pushUnsafe() {
187
- const builder = new xml2js.Builder();
188
- const new_xml = builder.buildObject(this.data_object);
189
- const data = `data=${encodeURIComponent(new_xml)}`;
190
- try {
191
- await this.api_connection.axios.post(this.getPath(), data, {
192
- headers: {
193
- 'Content-Type': 'application/x-www-form-urlencoded',
194
- },
195
- });
196
- }
197
- catch (error) {
198
- if (axios_1.default.isAxiosError(error)) {
199
- this.api_connection.log.error('Failed to push updates (axios): ', error.message);
200
- }
201
- else {
202
- this.api_connection.log.error('Failed to push updates (unknown): ', error);
203
- }
204
- }
205
- await this.forceFetch();
206
- }
207
198
  }
208
199
  __decorate([
209
200
  (0, typescript_memoize_1.MemoizeExpiring)(10 * 1000)
@@ -217,8 +208,8 @@ class InfinityEvolutionLocations extends BaseInfinityEvolutionApiModel {
217
208
  const systems = [];
218
209
  for (const location of this.data_object.locations.location) {
219
210
  for (const system of location.systems[0].system) {
220
- const linkparts = system['atom:link'][0]['$']['href'].split('/');
221
- systems.push(linkparts[linkparts.length - 1]);
211
+ const link_parts = system['atom:link'][0]['$']['href'].split('/');
212
+ systems.push(link_parts[link_parts.length - 1]);
222
213
  }
223
214
  }
224
215
  return systems;
@@ -230,7 +221,8 @@ class BaseInfinityEvolutionSystemApiModel extends BaseInfinityEvolutionApiModel
230
221
  super(api_connection);
231
222
  this.api_connection = api_connection;
232
223
  this.serialNumber = serialNumber;
233
- this.last_updated = 0;
224
+ this.last_updated = 0; // TODO use this
225
+ this.HASH_IGNORE_KEYS = new Set(['timestamp', 'localTime']);
234
226
  }
235
227
  async forceFetch() {
236
228
  await super.forceFetch();
@@ -329,6 +321,11 @@ class InfinityEvolutionSystemStatus extends BaseInfinityEvolutionSystemApiModel
329
321
  }
330
322
  exports.InfinityEvolutionSystemStatus = InfinityEvolutionSystemStatus;
331
323
  class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel {
324
+ constructor() {
325
+ super(...arguments);
326
+ /* Write APIs */
327
+ this.mutations = [];
328
+ }
332
329
  getPath() {
333
330
  return `/systems/${this.serialNumber}/config`;
334
331
  }
@@ -345,13 +342,6 @@ class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel
345
342
  await this.fetch();
346
343
  return this.data_object.config.mode[0];
347
344
  }
348
- async setMode(mode) {
349
- await this.forceFetch();
350
- if (mode !== await this.getMode()) {
351
- this.data_object.config.mode[0] = mode;
352
- await this.push();
353
- }
354
- }
355
345
  async getZone(zone) {
356
346
  await this.fetch();
357
347
  return this.data_object.config.zones[0].zone[zone.toString()];
@@ -396,8 +386,8 @@ class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel
396
386
  fan: this.data_object.config.vacfan,
397
387
  };
398
388
  }
399
- const activites_obj = (await this.getZone(zone)).activities[0];
400
- return activites_obj['activity'].find((activity) => activity['$'].id === activity_name);
389
+ const activities_obj = (await this.getZone(zone)).activities[0];
390
+ return activities_obj['activity'].find((activity) => activity['$'].id === activity_name);
401
391
  }
402
392
  async getZoneActivityFan(zone, activity) {
403
393
  const activity_obj = await this.getZoneActivityConfig(zone, activity);
@@ -440,9 +430,94 @@ class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel
440
430
  return (Math.round(temp * 2) / 2).toFixed(1);
441
431
  }
442
432
  }
443
- // TODO: this is unsafe if clsp and htsp are called at the same time, one could undo the other.
444
- async setZoneActivity(zone, clsp, htsp, hold_until, fan = null) {
433
+ async push() {
434
+ // Wait a bit so we can catch any other mutations that came in around the
435
+ // same time ...
436
+ await new Promise(r => setTimeout(r, 2000));
437
+ // ... and then make sure we aren't already fetching or pushing ...
438
+ await this.write_lock.runExclusive(async () => {
439
+ // ... and then only run if we still have mutations to do.
440
+ if (this.mutations.length > 0) {
441
+ // 1. Do mutations
442
+ const mutated_hash = await this.mutate();
443
+ if (mutated_hash === null) {
444
+ return;
445
+ }
446
+ // 2. Push
447
+ await this.forcePush();
448
+ // 3. Confirm
449
+ await new Promise(r => setTimeout(r, 5000));
450
+ await this.forceFetch();
451
+ if (mutated_hash === this.data_object_hash) {
452
+ this.api_connection.log.info('Changes sent to carrier api successfully.');
453
+ }
454
+ else {
455
+ this.api_connection.log.warn('Changes may not have successfully propagated to the carrier api.');
456
+ }
457
+ }
458
+ });
459
+ }
460
+ async mutate() {
461
+ // Refresh config.
462
+ const old_hash = this.data_object_hash;
445
463
  await this.forceFetch();
464
+ if (old_hash !== this.data_object_hash) {
465
+ this.api_connection.log.warn('Cached config was stale before mutation and push.');
466
+ }
467
+ // Do all the config mutations we have stored, and clear the array.
468
+ // TODO make mutations non-async. these need to happen in order. and async
469
+ // in a loop is an anti-pattern.
470
+ for (const m of this.mutations) {
471
+ await m();
472
+ }
473
+ this.mutations = [];
474
+ const mutated_hash = this.hashDataObject();
475
+ // If nothing actually changed, no need to push.
476
+ if (old_hash === mutated_hash) {
477
+ this.api_connection.log.warn('Config doesn\'t appear to have changed. No changes sent.');
478
+ return null;
479
+ }
480
+ return mutated_hash;
481
+ }
482
+ async forcePush() {
483
+ this.api_connection.log.info('Pushing changes to carrier api...');
484
+ const builder = new xml2js.Builder();
485
+ const new_xml = builder.buildObject(this.data_object);
486
+ const data = `data=${encodeURIComponent(new_xml)}`;
487
+ try {
488
+ await this.api_connection.axios.post(this.getPath(), data, {
489
+ headers: {
490
+ 'Content-Type': 'application/x-www-form-urlencoded',
491
+ },
492
+ });
493
+ }
494
+ catch (error) {
495
+ if (axios_1.default.isAxiosError(error)) {
496
+ this.api_connection.log.error('Failed to push updates (axios): ', error.message);
497
+ }
498
+ else {
499
+ this.api_connection.log.error('Failed to push updates (unknown): ', error);
500
+ }
501
+ }
502
+ }
503
+ async setMode(mode) {
504
+ this.mutations.push(async () => {
505
+ this.mutateMode(mode);
506
+ });
507
+ // Schedule the push event, but don't wait for it to return.
508
+ this.push();
509
+ }
510
+ mutateMode(mode) {
511
+ this.data_object.config.mode[0] = mode;
512
+ }
513
+ async setZoneActivity(zone, clsp, htsp, hold_until, fan = null) {
514
+ this.mutations.push(async () => {
515
+ await this.mutateZoneActivity(zone, clsp, htsp, hold_until, fan);
516
+ });
517
+ // Schedule the push event, but don't wait for it to return.
518
+ this.push();
519
+ }
520
+ async mutateZoneActivity(zone, clsp, htsp, hold_until, fan = null) {
446
521
  const zone_obj = await this.getZone(zone);
447
522
  // When moving to manual activity, default to prev activity settings.
448
523
  const manual_activity_obj = await this.getZoneActivityConfig(zone, exports.ACTIVITY.MANUAL);
@@ -452,7 +527,7 @@ class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel
452
527
  manual_activity_obj['htsp'][0] = prev_activity_obj['htsp'][0];
453
528
  manual_activity_obj['fan'][0] = prev_activity_obj['fan'][0];
454
529
  }
455
- // Set to manual activity
530
+ // Always set to manual activity
456
531
  zone_obj['holdActivity'][0] = exports.ACTIVITY.MANUAL;
457
532
  zone_obj['hold'][0] = 'on';
458
533
  zone_obj['otmr'][0] = hold_until || '';
@@ -466,7 +541,6 @@ class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel
466
541
  if (fan) {
467
542
  manual_activity_obj['fan'][0] = fan;
468
543
  }
469
- await this.push();
470
544
  }
471
545
  }
472
546
  exports.InfinityEvolutionSystemConfig = InfinityEvolutionSystemConfig;
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
@@ -115,7 +115,7 @@ class CarrierInfinityHomebridgePlatform {
115
115
  accessories.push(await this.registerOutdoorTempAccessory(system));
116
116
  }
117
117
  }
118
- const old_accessories = this.accessories.filter(accesory => !accessories.includes(accesory));
118
+ const old_accessories = this.accessories.filter(accessory => !accessories.includes(accessory));
119
119
  old_accessories.forEach(accessory => {
120
120
  this.log.info(`Removing old device "${accessory.displayName}" (serial:${accessory.context.serialNumber} zone:${accessory.context.zone})`);
121
121
  });
package/dist/platform.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
package/dist/platformAccessory.d.ts CHANGED
@@ -10,7 +10,7 @@ export declare class InfinityEvolutionPlatformAccessory {
10
10
  private system_profile;
11
11
  constructor(platform: CarrierInfinityHomebridgePlatform, accessory: PlatformAccessory);
12
12
  setupFanService(): void;
13
- getZoneActvity(zone: string): Promise<string>;
13
+ getZoneActivity(zone: string): Promise<string>;
14
14
  getHoldTime(): Promise<string>;
15
15
  convertSystemTemp2CharTemp(temp: number): Promise<CharacteristicValue>;
16
16
  convertCharTemp2SystemTemp(temp: CharacteristicValue | null): Promise<number | null>;
package/dist/platformAccessory.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"platformAccessory.d.ts","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAsB/D,qBAAa,kCAAkC;IAQ3C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAR5B,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;gBAGpC,QAAQ,EAAE,iCAAiC,EAC3C,SAAS,EAAE,iBAAiB;IA8M/C,eAAe,IAAI,IAAI;IAiBjB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAS7C,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAsB9B,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAItE,0BAA0B,CAAC,IAAI,EAAE,mBAAmB,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAO1F,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB;IAI1D,wBAAwB,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM;CAG3D"}
1
+ {"version":3,"file":"platformAccessory.d.ts","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAqB/D,qBAAa,kCAAkC;IAQ3C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAR5B,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;gBAGpC,QAAQ,EAAE,iCAAiC,EAC3C,SAAS,EAAE,iBAAiB;IAsJ/C,eAAe,IAAI,IAAI;IAgBjB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAS9C,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAsB9B,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAItE,0BAA0B,CAAC,IAAI,EAAE,mBAAmB,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAO1F,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB;IAI1D,wBAAwB,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM;CAG3D"}
package/dist/platformAccessory.js CHANGED
@@ -39,60 +39,11 @@ class InfinityEvolutionPlatformAccessory {
39
39
  .setCharacteristic(this.platform.Characteristic.Model, await this.system_profile.getModel());
40
40
  });
41
41
  // Create handlers
42
- new characteristics_ac_1.ACService(this.platform.api, system, this.accessory.context).wrap(this.service);
43
- this.service.getCharacteristic(this.platform.Characteristic.TargetHeatingCoolingState)
44
- .onGet(async () => {
45
- const target_state = await this.system_config.getMode();
46
- switch (target_state) {
47
- case infinityApi_1.SYSTEM_MODE.OFF:
48
- case infinityApi_1.SYSTEM_MODE.FAN_ONLY:
49
- return this.platform.Characteristic.TargetHeatingCoolingState.OFF;
50
- case infinityApi_1.SYSTEM_MODE.COOL:
51
- return this.platform.Characteristic.TargetHeatingCoolingState.COOL;
52
- case infinityApi_1.SYSTEM_MODE.HEAT:
53
- return this.platform.Characteristic.TargetHeatingCoolingState.HEAT;
54
- case infinityApi_1.SYSTEM_MODE.AUTO:
55
- return this.platform.Characteristic.TargetHeatingCoolingState.AUTO;
56
- default:
57
- this.platform.log.error(`Unknown target state '${target_state}'. Defaulting to off.`);
58
- return this.platform.Characteristic.TargetHeatingCoolingState.OFF;
59
- }
60
- })
61
- .onSet(async (value) => {
62
- if (value === this.service.getCharacteristic(this.platform.Characteristic.TargetHeatingCoolingState).value) {
63
- return;
64
- }
65
- switch (value) {
66
- case this.platform.Characteristic.TargetHeatingCoolingState.OFF: {
67
- // If manual fan is set, go to fan only mode
68
- if (await this.system_config.getZoneActivityFan(this.accessory.context.zone, await this.getZoneActvity(this.accessory.context.zone)) !== infinityApi_1.FAN_MODE.OFF) {
69
- return await this.system_config.setMode(infinityApi_1.SYSTEM_MODE.FAN_ONLY);
70
- // If no manual fan, go to full off
71
- }
72
- else {
73
- return await this.system_config.setMode(infinityApi_1.SYSTEM_MODE.OFF);
74
- }
75
- }
76
- case this.platform.Characteristic.TargetHeatingCoolingState.COOL:
77
- return await this.system_config.setMode(infinityApi_1.SYSTEM_MODE.COOL);
78
- case this.platform.Characteristic.TargetHeatingCoolingState.HEAT:
79
- return await this.system_config.setMode(infinityApi_1.SYSTEM_MODE.HEAT);
80
- case this.platform.Characteristic.TargetHeatingCoolingState.AUTO:
81
- return await this.system_config.setMode(infinityApi_1.SYSTEM_MODE.AUTO);
82
- default:
83
- this.platform.log.error(`Don't know how to set target state '${value}'. Making no change.`);
84
- }
85
- });
86
- this.service.getCharacteristic(this.platform.Characteristic.TemperatureDisplayUnits)
87
- .onGet(async () => {
88
- return await this.system_config.getUnits() === 'F' ?
89
- this.platform.Characteristic.TemperatureDisplayUnits.FAHRENHEIT :
90
- this.platform.Characteristic.TemperatureDisplayUnits.CELSIUS;
91
- });
42
+ new characteristics_ac_1.ACService(this.platform, this.accessory.context).wrap(this.service);
92
43
  this.service.getCharacteristic(this.platform.Characteristic.TargetTemperature)
93
44
  .onGet(async () => {
94
45
  const cmode = await this.system_config.getMode();
95
- const activity = await this.getZoneActvity(this.accessory.context.zone);
46
+ const activity = await this.getZoneActivity(this.accessory.context.zone);
96
47
  switch (cmode) {
97
48
  case infinityApi_1.SYSTEM_MODE.COOL:
98
49
  return await this.convertSystemTemp2CharTemp(await this.system_config.getZoneActivityCoolSetpoint(this.accessory.context.zone, activity));
@@ -119,7 +70,7 @@ class InfinityEvolutionPlatformAccessory {
119
70
  });
120
71
  this.service.getCharacteristic(this.platform.Characteristic.CoolingThresholdTemperature)
121
72
  .onGet(async () => {
122
- return this.convertSystemTemp2CharTemp(await this.system_config.getZoneActivityCoolSetpoint(this.accessory.context.zone, await this.getZoneActvity(this.accessory.context.zone)));
73
+ return this.convertSystemTemp2CharTemp(await this.system_config.getZoneActivityCoolSetpoint(this.accessory.context.zone, await this.getZoneActivity(this.accessory.context.zone)));
123
74
  })
124
75
  .onSet(async (value) => {
125
76
  if ((0, helpers_1.areCharTempsClose)(value, this.service.getCharacteristic(this.platform.Characteristic.CoolingThresholdTemperature).value)) {
@@ -129,7 +80,7 @@ class InfinityEvolutionPlatformAccessory {
129
80
  });
130
81
  this.service.getCharacteristic(this.platform.Characteristic.HeatingThresholdTemperature)
131
82
  .onGet(async () => {
132
- return this.convertSystemTemp2CharTemp(await this.system_config.getZoneActivityHeatSetpoint(this.accessory.context.zone, await this.getZoneActvity(this.accessory.context.zone)));
83
+ return this.convertSystemTemp2CharTemp(await this.system_config.getZoneActivityHeatSetpoint(this.accessory.context.zone, await this.getZoneActivity(this.accessory.context.zone)));
133
84
  })
134
85
  .onSet(async (value) => {
135
86
  if ((0, helpers_1.areCharTempsClose)(value, this.service.getCharacteristic(this.platform.Characteristic.HeatingThresholdTemperature).value)) {
@@ -146,9 +97,9 @@ class InfinityEvolutionPlatformAccessory {
146
97
  this.accessory.removeService(this.fan_service);
147
98
  }
148
99
  // Filter Control
149
- new characteristics_filter_1.FilterService(this.platform.api, system, this.accessory.context).wrap(this.service);
100
+ new characteristics_filter_1.FilterService(this.platform, this.accessory.context).wrap(this.service);
150
101
  // Humidity Control
151
- new characteristics_humidity_1.ThermostatRHService(this.platform.api, system, this.accessory.context).wrap(this.service);
102
+ new characteristics_humidity_1.ThermostatRHService(this.platform, this.accessory.context).wrap(this.service);
152
103
  }
153
104
  setupFanService() {
154
105
  this.fan_service = this.fan_service || this.accessory.addService(this.platform.Service.Fanv2);
@@ -156,9 +107,9 @@ class InfinityEvolutionPlatformAccessory {
156
107
  var _a;
157
108
  (_a = this.fan_service) === null || _a === void 0 ? void 0 : _a.setCharacteristic(this.platform.Characteristic.Name, await this.system_config.getZoneName(this.accessory.context.zone) + ' Fan');
158
109
  });
159
- new characteristics_fan_1.FanService(this.platform.api, this.platform.systems[this.accessory.context.serialNumber], this.accessory.context).wrap(this.fan_service);
110
+ new characteristics_fan_1.FanService(this.platform, this.accessory.context).wrap(this.fan_service);
160
111
  }
161
- async getZoneActvity(zone) {
112
+ async getZoneActivity(zone) {
162
113
  // Vacation scheduling is weird, and changes infrequently. Just get it from status.
163
114
  if (await this.system_status.getZoneActivity(zone) === infinityApi_1.ACTIVITY.VACATION) {
164
115
  return infinityApi_1.ACTIVITY.VACATION;
package/dist/platformAccessory.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"platformAccessory.js","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"platformAccessory.js","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":"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"}
package/dist/settings.d.ts CHANGED
@@ -7,7 +7,7 @@ export declare const PLATFORM_NAME = "CarrierInfinity";
7
7
  */
8
8
  export declare const PLUGIN_NAME = "homebridge-carrier-infinity";
9
9
  /**
10
- * Carrier/Bryant Infnity/Evolution API Settings
10
+ * Carrier/Bryant Infinity/Evolution API Settings
11
11
  */
12
12
  export declare const INFINITY_API_BASE_URL = "https://www.app-api.ing.carrier.com";
13
13
  export declare const INFINITY_API_CONSUMER_KEY = "8j30j19aj103911h";
package/dist/settings.js CHANGED
@@ -10,7 +10,7 @@ exports.PLATFORM_NAME = 'CarrierInfinity';
10
10
  */
11
11
  exports.PLUGIN_NAME = 'homebridge-carrier-infinity';
12
12
  /**
13
- * Carrier/Bryant Infnity/Evolution API Settings
13
+ * Carrier/Bryant Infinity/Evolution API Settings
14
14
  */
15
15
  exports.INFINITY_API_BASE_URL = 'https://www.app-api.ing.carrier.com';
16
16
  exports.INFINITY_API_CONSUMER_KEY = '8j30j19aj103911h';
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.5.4",
4
+ "version": "1.5.7",
5
5
  "description": "Standalone homebridge plugin for Carrier Infinity / Bryant Evolution / ICP Brands Ion thermostats.",
6
6
  "license": "MIT",
7
7
  "repository": {
@@ -12,8 +12,8 @@
12
12
  "url": "https://github.com/grivkees/homebridge-carrier-infinity/issues"
13
13
  },
14
14
  "engines": {
15
- "node": ">=10.17.0",
16
- "homebridge": ">=1.0.0"
15
+ "node": ">=12.13.0",
16
+ "homebridge": ">=1.2"
17
17
  },
18
18
  "main": "dist/index.js",
19
19
  "scripts": {
@@ -37,28 +37,31 @@
37
37
  ],
38
38
  "dependencies": {
39
39
  "async-mutex": "^0.3.1",
40
- "axios": "^0.21.1",
40
+ "axios": "^0.26.0",
41
41
  "oauth-signature": "^1.5.0",
42
- "xml2js": "^0.4.23",
43
- "typescript-memoize": "^1.0.1"
42
+ "object-hash": "^2.2.0",
43
+ "typescript-memoize": "^1.0.1",
44
+ "xml2js": "^0.4.23"
44
45
  },
45
46
  "devDependencies": {
46
- "@commitlint/cli": "^13.2.0",
47
+ "@commitlint/cli": "^16.2.1",
47
48
  "@commitlint/config-conventional": "^13.2.0",
48
- "@commitlint/cz-commitlint": "^13.2.0",
49
- "@semantic-release/git": "^9.0.0",
49
+ "@commitlint/cz-commitlint": "^16.2.1",
50
+ "@semantic-release/git": "^10.0.1",
50
51
  "@types/jest": "^27.0.2",
51
52
  "@types/node": "^16.4.3",
53
+ "@types/object-hash": "^2.2.0",
52
54
  "@types/xml2js": "^0.4.8",
53
- "@typescript-eslint/eslint-plugin": "^4.6.1",
54
- "@typescript-eslint/parser": "^4.6.1",
55
+ "@typescript-eslint/eslint-plugin": "^5.12.0",
56
+ "@typescript-eslint/parser": "^5.12.0",
55
57
  "commitizen": "^4.2.4",
56
- "eslint": "^7.13.0",
58
+ "eslint": "^8.9.0",
59
+ "eslint-plugin-spellcheck": "^0.0.19",
57
60
  "homebridge": "^1.2.3",
58
61
  "jest": "^27.0.4",
59
62
  "nodemon": "^2.0.6",
60
63
  "rimraf": "^3.0.2",
61
- "semantic-release": "^17.4.3",
64
+ "semantic-release": "^19.0.2",
62
65
  "ts-jest": "^27.0.3",
63
66
  "ts-node": "^10.0.0",
64
67
  "typescript": "^4.0.5"