homebridge-easy-mqtt 1.4.1-beta.1 → 1.5.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.
Files changed (137) hide show
  1. package/CHANGELOG.md +8 -1
  2. package/README.md +86 -5
  3. package/config.schema.json +76 -1
  4. package/dist/accessory/abstract/base.d.ts +2 -2
  5. package/dist/accessory/abstract/base.js +5 -25
  6. package/dist/accessory/abstract/base.js.map +1 -1
  7. package/dist/accessory/abstract/common.d.ts +17 -6
  8. package/dist/accessory/abstract/common.js +136 -28
  9. package/dist/accessory/abstract/common.js.map +1 -1
  10. package/dist/accessory/abstract/mqtt.d.ts +2 -0
  11. package/dist/accessory/abstract/mqtt.js +13 -12
  12. package/dist/accessory/abstract/mqtt.js.map +1 -1
  13. package/dist/accessory/addons/filter.d.ts +0 -1
  14. package/dist/accessory/addons/filter.js +1 -13
  15. package/dist/accessory/addons/filter.js.map +1 -1
  16. package/dist/accessory/characteristic/characteristic.d.ts +3 -0
  17. package/dist/accessory/characteristic/characteristic.js +23 -0
  18. package/dist/accessory/characteristic/characteristic.js.map +1 -0
  19. package/dist/accessory/characteristic/custom.d.ts +1 -0
  20. package/dist/accessory/characteristic/custom.js +3 -0
  21. package/dist/accessory/characteristic/custom.js.map +1 -1
  22. package/dist/accessory/characteristic/eve.d.ts +6 -0
  23. package/dist/accessory/characteristic/eve.js +24 -0
  24. package/dist/accessory/characteristic/eve.js.map +1 -0
  25. package/dist/accessory/climate/active.d.ts +0 -4
  26. package/dist/accessory/climate/active.js +4 -36
  27. package/dist/accessory/climate/active.js.map +1 -1
  28. package/dist/accessory/climate/fan2.d.ts +1 -12
  29. package/dist/accessory/climate/fan2.js +22 -101
  30. package/dist/accessory/climate/fan2.js.map +1 -1
  31. package/dist/accessory/climate/heaterCooler.d.ts +1 -11
  32. package/dist/accessory/climate/heaterCooler.js +24 -100
  33. package/dist/accessory/climate/heaterCooler.js.map +1 -1
  34. package/dist/accessory/climate/purifier.d.ts +1 -11
  35. package/dist/accessory/climate/purifier.js +20 -90
  36. package/dist/accessory/climate/purifier.js.map +1 -1
  37. package/dist/accessory/climate/temperatureControl.d.ts +2 -1
  38. package/dist/accessory/climate/temperatureControl.js +3 -3
  39. package/dist/accessory/climate/temperatureControl.js.map +1 -1
  40. package/dist/accessory/climate/thermostat.d.ts +1 -9
  41. package/dist/accessory/climate/thermostat.js +24 -77
  42. package/dist/accessory/climate/thermostat.js.map +1 -1
  43. package/dist/accessory/garage.d.ts +1 -9
  44. package/dist/accessory/garage.js +19 -85
  45. package/dist/accessory/garage.js.map +1 -1
  46. package/dist/accessory/lock.d.ts +1 -5
  47. package/dist/accessory/lock.js +23 -57
  48. package/dist/accessory/lock.js.map +1 -1
  49. package/dist/accessory/onoff/lightbulb.d.ts +1 -2
  50. package/dist/accessory/onoff/lightbulb.js +7 -13
  51. package/dist/accessory/onoff/lightbulb.js.map +1 -1
  52. package/dist/accessory/onoff/onoff.d.ts +2 -4
  53. package/dist/accessory/onoff/onoff.js +28 -32
  54. package/dist/accessory/onoff/onoff.js.map +1 -1
  55. package/dist/accessory/onoff/outlet.d.ts +1 -1
  56. package/dist/accessory/onoff/outlet.js +3 -3
  57. package/dist/accessory/onoff/outlet.js.map +1 -1
  58. package/dist/accessory/onoff/switch.d.ts +1 -2
  59. package/dist/accessory/onoff/switch.js +0 -3
  60. package/dist/accessory/onoff/switch.js.map +1 -1
  61. package/dist/accessory/position/blind.d.ts +1 -2
  62. package/dist/accessory/position/blind.js +5 -11
  63. package/dist/accessory/position/blind.js.map +1 -1
  64. package/dist/accessory/position/position.d.ts +0 -7
  65. package/dist/accessory/position/position.js +11 -62
  66. package/dist/accessory/position/position.js.map +1 -1
  67. package/dist/accessory/security.d.ts +3 -7
  68. package/dist/accessory/security.js +37 -69
  69. package/dist/accessory/security.js.map +1 -1
  70. package/dist/accessory/sensor/air.d.ts +1 -5
  71. package/dist/accessory/sensor/air.js +14 -46
  72. package/dist/accessory/sensor/air.js.map +1 -1
  73. package/dist/accessory/sensor/carbonDioxide.d.ts +1 -1
  74. package/dist/accessory/sensor/carbonDioxide.js +3 -3
  75. package/dist/accessory/sensor/carbonDioxide.js.map +1 -1
  76. package/dist/accessory/sensor/carbonMonoxide.d.ts +1 -1
  77. package/dist/accessory/sensor/carbonMonoxide.js +3 -3
  78. package/dist/accessory/sensor/carbonMonoxide.js.map +1 -1
  79. package/dist/accessory/sensor/contact.d.ts +1 -1
  80. package/dist/accessory/sensor/contact.js +18 -5
  81. package/dist/accessory/sensor/contact.js.map +1 -1
  82. package/dist/accessory/sensor/humidity.d.ts +1 -1
  83. package/dist/accessory/sensor/humidity.js +7 -4
  84. package/dist/accessory/sensor/humidity.js.map +1 -1
  85. package/dist/accessory/sensor/leak.d.ts +1 -1
  86. package/dist/accessory/sensor/leak.js +3 -3
  87. package/dist/accessory/sensor/leak.js.map +1 -1
  88. package/dist/accessory/sensor/light.d.ts +1 -1
  89. package/dist/accessory/sensor/light.js +3 -3
  90. package/dist/accessory/sensor/light.js.map +1 -1
  91. package/dist/accessory/sensor/motion.d.ts +1 -1
  92. package/dist/accessory/sensor/motion.js +7 -4
  93. package/dist/accessory/sensor/motion.js.map +1 -1
  94. package/dist/accessory/sensor/occupancy.d.ts +1 -1
  95. package/dist/accessory/sensor/occupancy.js +3 -3
  96. package/dist/accessory/sensor/occupancy.js.map +1 -1
  97. package/dist/accessory/sensor/sensor.d.ts +0 -2
  98. package/dist/accessory/sensor/sensor.js +2 -26
  99. package/dist/accessory/sensor/sensor.js.map +1 -1
  100. package/dist/accessory/sensor/smoke.d.ts +1 -1
  101. package/dist/accessory/sensor/smoke.js +3 -3
  102. package/dist/accessory/sensor/smoke.js.map +1 -1
  103. package/dist/accessory/sensor/temperature.d.ts +1 -1
  104. package/dist/accessory/sensor/temperature.js +7 -4
  105. package/dist/accessory/sensor/temperature.js.map +1 -1
  106. package/dist/accessory/valve.d.ts +1 -5
  107. package/dist/accessory/valve.js +7 -41
  108. package/dist/accessory/valve.js.map +1 -1
  109. package/dist/homebridge/platform.js +8 -4
  110. package/dist/homebridge/platform.js.map +1 -1
  111. package/dist/homebridge-ui/public/index.html +1 -1
  112. package/dist/homebridge-ui/public/ui.js +1 -1
  113. package/dist/i18n/en.d.ts +19 -5
  114. package/dist/i18n/en.js +20 -6
  115. package/dist/i18n/en.js.map +1 -1
  116. package/dist/i18n/fr.d.ts +19 -5
  117. package/dist/i18n/i18n.d.ts +19 -5
  118. package/dist/i18n/it.d.ts +19 -5
  119. package/dist/i18n/ro.d.ts +19 -5
  120. package/dist/i18n/template.d.ts +19 -5
  121. package/dist/i18n/vi.d.ts +19 -5
  122. package/dist/model/enums.d.ts +12 -1
  123. package/dist/model/enums.js +12 -0
  124. package/dist/model/enums.js.map +1 -1
  125. package/dist/model/history.d.ts +32 -0
  126. package/dist/model/history.js +128 -0
  127. package/dist/model/history.js.map +1 -0
  128. package/dist/model/mqtt.d.ts +1 -0
  129. package/dist/model/mqtt.js +37 -11
  130. package/dist/model/mqtt.js.map +1 -1
  131. package/dist/model/types.d.ts +15 -3
  132. package/lib/fakegato-history/fakegato-history.js +887 -0
  133. package/lib/fakegato-history/fakegato-storage.js +178 -0
  134. package/lib/fakegato-history/fakegato-timer.js +133 -0
  135. package/lib/fakegato-history/lib/uuid.js +25 -0
  136. package/lib/fakegato-history/package.json +5 -0
  137. package/package.json +2 -1
@@ -3,112 +3,42 @@ import { FilterMaintenance } from '../addons/filter.js';
3
3
  import { strings } from '../../i18n/i18n.js';
4
4
  import { AccessoryType, HKCharacteristicKey } from '../../model/enums.js';
5
5
  export class PurifierAccessory extends ActiveClimateAccessory {
6
- CURRENT_STATE_MAP;
7
- TARGET_STATE_MAP;
6
+ getAccessoryType() {
7
+ return AccessoryType.AirPurifier;
8
+ }
8
9
  constructor(dependency) {
9
10
  super(dependency);
10
- this.CURRENT_STATE_MAP = new Map([
11
+ const currentStates = new Map([
11
12
  ['valueModeInactive', dependency.Characteristic.CurrentAirPurifierState.INACTIVE],
12
13
  ['valueModeIdle', dependency.Characteristic.CurrentAirPurifierState.IDLE],
13
14
  ['valueModePurifying', dependency.Characteristic.CurrentAirPurifierState.PURIFYING_AIR],
14
15
  ]);
15
- this.TARGET_STATE_MAP = new Map([
16
- ['valueModeManual', dependency.Characteristic.TargetAirPurifierState.MANUAL],
17
- ['valueModeAuto', dependency.Characteristic.TargetAirPurifierState.AUTO],
16
+ const currentStrings = new Map([
17
+ [dependency.Characteristic.CurrentAirPurifierState.INACTIVE, strings.purifier.stateInactive],
18
+ [dependency.Characteristic.CurrentAirPurifierState.IDLE, strings.purifier.stateIdle],
19
+ [dependency.Characteristic.CurrentAirPurifierState.PURIFYING_AIR, strings.purifier.statePurifying],
18
20
  ]);
19
- const validCurrentStates = Array.from(this.CURRENT_STATE_MAP.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
21
+ const validCurrentStates = Array.from(currentStates.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
20
22
  if (validCurrentStates.length === 0) {
21
23
  this.log.error(strings.purifier.noCurrentStateValues, this.name);
22
24
  return;
23
25
  }
24
- this.setup(HKCharacteristicKey.CurrentAirPurifierState, this.CURRENT_STATE_MAP.get(validCurrentStates[0]), 'topicGetCurrentPurifierState', this.onCurrentStateUpdate.bind(this), true)
25
- ?.setProps({ validValues: validCurrentStates.map((key) => this.CURRENT_STATE_MAP.get(key)) });
26
- const validTargetStates = Array.from(this.TARGET_STATE_MAP.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
26
+ this.setup(HKCharacteristicKey.CurrentAirPurifierState, currentStates.get(validCurrentStates[0]), 'topicGetCurrentPurifierState', this.bindOnUpdateState(HKCharacteristicKey.CurrentAirPurifierState, currentStates, currentStrings, strings.purifier.stateUnknown), true)?.setProps({ validValues: validCurrentStates.map((key) => currentStates.get(key)) });
27
+ const targetStates = new Map([
28
+ ['valueModeManual', dependency.Characteristic.TargetAirPurifierState.MANUAL],
29
+ ['valueModeAuto', dependency.Characteristic.TargetAirPurifierState.AUTO],
30
+ ]);
31
+ const validTargetStates = Array.from(targetStates.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
27
32
  if (validTargetStates.length === 0) {
28
33
  this.log.error(strings.purifier.noTargetStateValues, this.name);
29
34
  return;
30
35
  }
31
- this.setup(HKCharacteristicKey.TargetAirPurifierState, this.TARGET_STATE_MAP.get(validTargetStates[0]), 'topicGetTargetPurifierState', this.onTargetStateUpdate.bind(this), true, 'topicSetTargetPurifierState', this.onSetTargetState.bind(this))
32
- ?.setProps({ validValues: validTargetStates.map((key) => this.TARGET_STATE_MAP.get(key)) });
36
+ const targetStrings = new Map([
37
+ [dependency.Characteristic.TargetAirPurifierState.AUTO, strings.purifier.stateAuto],
38
+ [dependency.Characteristic.TargetAirPurifierState.MANUAL, strings.purifier.stateManual],
39
+ ]);
40
+ this.setup(HKCharacteristicKey.TargetAirPurifierState, targetStates.get(validTargetStates[0]), 'topicGetTargetPurifierState', this.bindOnUpdateState(HKCharacteristicKey.TargetAirPurifierState, targetStates, targetStrings, strings.purifier.stateUnknown), true, 'topicSetTargetPurifierState', this.bindOnSetState(HKCharacteristicKey.TargetAirPurifierState, 'topicSetTargetPurifierState', targetStates, targetStrings, strings.purifier.badValue))?.setProps({ validValues: validTargetStates.map((key) => targetStates.get(key)) });
33
41
  this.addTopicHandlers(FilterMaintenance.topicHandlers(dependency.Service, this, dependency.config));
34
42
  }
35
- getAccessoryType() {
36
- return AccessoryType.AirPurifier;
37
- }
38
- async onCurrentStateUpdate(_topic, value) {
39
- const state = this.toCurrentCVState(value);
40
- if (state === undefined) {
41
- return;
42
- }
43
- this.onUpdate(HKCharacteristicKey.CurrentAirPurifierState, state, this.stateStringForCurrentCV(state));
44
- }
45
- async onTargetStateUpdate(_topic, value) {
46
- const state = this.toTargetCVState(value);
47
- if (state === undefined) {
48
- return;
49
- }
50
- this.onUpdate(HKCharacteristicKey.TargetAirPurifierState, state, this.stateStringForTargetCV(state));
51
- }
52
- async onSetTargetState(value) {
53
- const target = this.fromCVState(value);
54
- if (target === undefined) {
55
- return;
56
- }
57
- this.onSet(HKCharacteristicKey.TargetAirPurifierState, value, target, 'topicSetTargetPurifierState', this.stateStringForTargetCV(value));
58
- }
59
- fromCVState(value) {
60
- let primative = undefined;
61
- this.TARGET_STATE_MAP.forEach((test, key) => {
62
- if (value === test) {
63
- primative = this.getPrimitiveValue(key);
64
- }
65
- });
66
- if (primative === undefined) {
67
- this.log.error(strings.purifier.badValue, this.name, `'${value}'`);
68
- }
69
- return primative;
70
- }
71
- toCurrentCVState(value) {
72
- switch (value) {
73
- case this.getPrimitiveValue('valueModeInactive', false):
74
- return this.CURRENT_STATE_MAP.get('valueModeInactive');
75
- case this.getPrimitiveValue('valueModeIdle', false):
76
- return this.CURRENT_STATE_MAP.get('valueModeIdle');
77
- case this.getPrimitiveValue('valueModePurifying', false):
78
- return this.CURRENT_STATE_MAP.get('valueModePurifying');
79
- }
80
- this.logIfDesired(strings.purifier.unknownValue, `'${value}'`);
81
- }
82
- toTargetCVState(value) {
83
- switch (value) {
84
- case this.getPrimitiveValue('valueModeAuto', false):
85
- return this.TARGET_STATE_MAP.get('valueModeAuto');
86
- case this.getPrimitiveValue('valueModeManual', false):
87
- return this.TARGET_STATE_MAP.get('valueModeManual');
88
- }
89
- this.logIfDesired(strings.purifier.unknownValue, `'${value}'`);
90
- }
91
- stateStringForCurrentCV(state) {
92
- switch (state) {
93
- case this.Characteristic.CurrentAirPurifierState.INACTIVE:
94
- return strings.purifier.stateInactive;
95
- case this.Characteristic.CurrentAirPurifierState.IDLE:
96
- return strings.purifier.stateIdle;
97
- case this.Characteristic.CurrentAirPurifierState.PURIFYING_AIR:
98
- return strings.purifier.statePurifying;
99
- default:
100
- return strings.purifier.stateUnknown;
101
- }
102
- }
103
- stateStringForTargetCV(state) {
104
- switch (state) {
105
- case this.Characteristic.TargetAirPurifierState.AUTO:
106
- return strings.purifier.stateAuto;
107
- case this.Characteristic.TargetAirPurifierState.MANUAL:
108
- return strings.purifier.stateManual;
109
- default:
110
- return strings.purifier.stateUnknown;
111
- }
112
- }
113
43
  }
114
44
  //# sourceMappingURL=purifier.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"purifier.js","sourceRoot":"","sources":["../../../src/accessory/climate/purifier.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"purifier.js","sourceRoot":"","sources":["../../../src/accessory/climate/purifier.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import { CharacteristicValue } from 'homebridge';
2
2
  import { BaseAccessory } from '../abstract/base.js';
3
+ import { HKCharacteristicKey } from '../../model/enums.js';
3
4
  import { MQTTAccessoryDependency, TemperatureControlConfig } from '../../model/types.js';
4
5
  import { TemperatureUnits } from '../../tools/temperature.js';
5
6
  export declare const DEFAULT_TEMPERATURE = 10;
@@ -7,6 +8,6 @@ export declare abstract class TemperatureControlAccessory<C extends TemperatureC
7
8
  constructor(dependency: MQTTAccessoryDependency<C>);
8
9
  protected setupTemperatureControlCharacteristics(): void;
9
10
  protected get temperatureUnits(): TemperatureUnits;
10
- private bindOnSetThreshold;
11
+ protected bindOnSetTemperature(charKey: HKCharacteristicKey, topic: keyof C, logTemplate: string): (value: CharacteristicValue) => Promise<void>;
11
12
  protected temperatureFromCV(value: CharacteristicValue): number;
12
13
  }
@@ -14,13 +14,13 @@ export class TemperatureControlAccessory extends BaseAccessory {
14
14
  ? this.Characteristic.TemperatureDisplayUnits.FAHRENHEIT : this.Characteristic.TemperatureDisplayUnits.CELSIUS;
15
15
  this.setCharacteristicValue(HKCharacteristicKey.TemperatureDisplayUnits, temperatureDisplayUnits);
16
16
  this.setup(HKCharacteristicKey.CurrentTemperature, DEFAULT_TEMPERATURE, 'topicGetCurrentTemperature', this.bindOnUpdateTemperature(this.config, HKCharacteristicKey.CurrentTemperature, strings.climate.temperatureUpdate), true);
17
- this.setup(HKCharacteristicKey.CoolingThresholdTemperature, DEFAULT_COOLING_THRESHOLD, 'topicGetCoolingThresholdTemperature', this.bindOnUpdateTemperature(this.config, HKCharacteristicKey.CoolingThresholdTemperature, strings.climate.coolingThreshold), false, 'topicSetCoolingThresholdTemperature', this.bindOnSetThreshold(HKCharacteristicKey.CoolingThresholdTemperature, 'topicSetCoolingThresholdTemperature', strings.climate.coolingThresholdFuture));
18
- this.setup(HKCharacteristicKey.HeatingThresholdTemperature, DEFAULT_HEATING_THRESHOLD, 'topicGetHeatingThresholdTemperature', this.bindOnUpdateTemperature(this.config, HKCharacteristicKey.HeatingThresholdTemperature, strings.climate.heatingThreshold), false, 'topicSetHeatingThresholdTemperature', this.bindOnSetThreshold(HKCharacteristicKey.HeatingThresholdTemperature, 'topicSetHeatingThresholdTemperature', strings.climate.heatingThresholdFuture));
17
+ this.setup(HKCharacteristicKey.CoolingThresholdTemperature, DEFAULT_COOLING_THRESHOLD, 'topicGetCoolingThresholdTemperature', this.bindOnUpdateTemperature(this.config, HKCharacteristicKey.CoolingThresholdTemperature, strings.climate.coolingThreshold), false, 'topicSetCoolingThresholdTemperature', this.bindOnSetTemperature(HKCharacteristicKey.CoolingThresholdTemperature, 'topicSetCoolingThresholdTemperature', strings.climate.coolingThresholdFuture));
18
+ this.setup(HKCharacteristicKey.HeatingThresholdTemperature, DEFAULT_HEATING_THRESHOLD, 'topicGetHeatingThresholdTemperature', this.bindOnUpdateTemperature(this.config, HKCharacteristicKey.HeatingThresholdTemperature, strings.climate.heatingThreshold), false, 'topicSetHeatingThresholdTemperature', this.bindOnSetTemperature(HKCharacteristicKey.HeatingThresholdTemperature, 'topicSetHeatingThresholdTemperature', strings.climate.heatingThresholdFuture));
19
19
  }
20
20
  get temperatureUnits() {
21
21
  return temperatureUnits(this.config.temperatureUnits);
22
22
  }
23
- bindOnSetThreshold(charKey, topic, logTemplate) {
23
+ bindOnSetTemperature(charKey, topic, logTemplate) {
24
24
  return (async (value) => {
25
25
  const temperature = this.temperatureFromCV(value);
26
26
  const logString = logTemplate.replace('%d°%s', `${temperature}°${this.temperatureUnits}`);
@@ -1 +1 @@
1
- {"version":3,"file":"temperatureControl.js","sourceRoot":"","sources":["../../../src/accessory/climate/temperatureControl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"temperatureControl.js","sourceRoot":"","sources":["../../../src/accessory/climate/temperatureControl.ts"],"names":[],"mappings":"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"}
@@ -2,14 +2,6 @@ import { TemperatureControlAccessory } from './temperatureControl.js';
2
2
  import { AccessoryType } from '../../model/enums.js';
3
3
  import { MQTTAccessoryDependency, ThermostatConfig } from '../../model/types.js';
4
4
  export declare class ThermostatAccessory extends TemperatureControlAccessory<ThermostatConfig> {
5
- private readonly STATE_MAP;
6
- constructor(dependency: MQTTAccessoryDependency<ThermostatConfig>);
7
5
  protected getAccessoryType(): AccessoryType;
8
- private bindOnStateUpdate;
9
- private onSetTargetState;
10
- private onSetTemperature;
11
- private onSetHumidity;
12
- private fromCVState;
13
- private toCVState;
14
- private stateStringForCV;
6
+ constructor(dependency: MQTTAccessoryDependency<ThermostatConfig>);
15
7
  }
@@ -1,97 +1,44 @@
1
1
  import { TemperatureControlAccessory, DEFAULT_TEMPERATURE } from './temperatureControl.js';
2
2
  import { strings } from '../../i18n/i18n.js';
3
3
  import { AccessoryType, HKCharacteristicKey } from '../../model/enums.js';
4
+ import { HistoryType } from '../../model/history.js';
4
5
  export class ThermostatAccessory extends TemperatureControlAccessory {
5
- STATE_MAP;
6
+ getAccessoryType() {
7
+ return AccessoryType.Thermostat;
8
+ }
6
9
  constructor(dependency) {
7
10
  super(dependency);
8
11
  this.setupTemperatureControlCharacteristics();
9
- this.STATE_MAP = new Map([
12
+ const stateMap = new Map([
10
13
  ['valueModeOff', dependency.Characteristic.TargetHeatingCoolingState.OFF],
11
14
  ['valueModeHeat', dependency.Characteristic.TargetHeatingCoolingState.HEAT],
12
15
  ['valueModeCool', dependency.Characteristic.TargetHeatingCoolingState.COOL],
13
16
  ['valueModeAuto', dependency.Characteristic.TargetHeatingCoolingState.AUTO],
14
17
  ]);
15
- const validTargetStates = Array.from(this.STATE_MAP.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
18
+ const validTargetStates = Array.from(stateMap.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
16
19
  if (validTargetStates.length === 0 || (validTargetStates.length === 1 && validTargetStates[0] === 'valueModeAuto')) {
17
20
  this.log.error(strings.thermostat.noStateValues, this.name);
18
21
  return;
19
22
  }
20
- this.setup(HKCharacteristicKey.TargetHeatingCoolingState, this.STATE_MAP.get(validTargetStates[0]), 'topicGetTargetHeatingCoolingState', this.bindOnStateUpdate(HKCharacteristicKey.TargetHeatingCoolingState, true), true, 'topicSetTargetHeatingCoolingState', this.onSetTargetState.bind(this))
21
- ?.setProps({ validValues: validTargetStates.map((key) => this.STATE_MAP.get(key)) });
23
+ const targetStrings = new Map([
24
+ [dependency.Characteristic.TargetHeatingCoolingState.AUTO, strings.thermostat.stateAutoFuture],
25
+ [dependency.Characteristic.TargetHeatingCoolingState.COOL, strings.thermostat.stateCoolFuture],
26
+ [dependency.Characteristic.TargetHeatingCoolingState.HEAT, strings.thermostat.stateHeatFuture],
27
+ [dependency.Characteristic.TargetHeatingCoolingState.OFF, strings.thermostat.stateOffFuture],
28
+ ]);
29
+ this.setup(HKCharacteristicKey.TargetHeatingCoolingState, stateMap.get(validTargetStates[0]), 'topicGetTargetHeatingCoolingState', this.bindOnUpdateState(HKCharacteristicKey.TargetHeatingCoolingState, stateMap, targetStrings, strings.thermostat.stateUnknown), true, 'topicSetTargetHeatingCoolingState', this.bindOnSetState(HKCharacteristicKey.TargetHeatingCoolingState, 'topicSetTargetHeatingCoolingState', stateMap, targetStrings, strings.thermostat.badValue))?.setProps({ validValues: validTargetStates.map((key) => stateMap.get(key)) });
30
+ const currentStrings = new Map([
31
+ [dependency.Characteristic.CurrentHeatingCoolingState.COOL, strings.thermostat.stateCool],
32
+ [dependency.Characteristic.CurrentHeatingCoolingState.HEAT, strings.thermostat.stateHeat],
33
+ [dependency.Characteristic.CurrentHeatingCoolingState.OFF, strings.thermostat.stateOff],
34
+ ]);
22
35
  const validCurrentStates = validTargetStates.filter((key) => key !== 'valueModeAuto');
23
- this.setup(HKCharacteristicKey.CurrentHeatingCoolingState, this.STATE_MAP.get(validCurrentStates[0]), 'topicGetCurrentHeatingCoolingState', this.bindOnStateUpdate(HKCharacteristicKey.CurrentHeatingCoolingState), true)
24
- ?.setProps({ validValues: validCurrentStates.map((key) => this.STATE_MAP.get(key)) });
25
- this.setup(HKCharacteristicKey.TargetTemperature, DEFAULT_TEMPERATURE, 'topicGetTargetTemperature', this.bindOnUpdateTemperature(dependency.config, HKCharacteristicKey.TargetTemperature, strings.thermostat.temperatureTarget), true, 'topicSetTargetTemperature', this.onSetTemperature.bind(this));
26
- this.setup(HKCharacteristicKey.CurrentRelativeHumidity, 0, 'topicGetCurrentRelativeHumidity', this.bindOnUpdateNumeric(HKCharacteristicKey.CurrentRelativeHumidity, strings.climate.humidityUpdate), false);
27
- this.setup(HKCharacteristicKey.TargetRelativeHumidity, 0, 'topicGetTargetRelativeHumidity', this.bindOnUpdateNumeric(HKCharacteristicKey.TargetRelativeHumidity, strings.thermostat.humidityFuture), false, 'topicSetTargetRelativeHumidity', this.onSetHumidity.bind(this));
28
- }
29
- getAccessoryType() {
30
- return AccessoryType.Thermostat;
31
- }
32
- bindOnStateUpdate(charKey, future = false) {
33
- return (async (_topic, value) => {
34
- const state = this.toCVState(value);
35
- if (state === undefined) {
36
- return;
37
- }
38
- this.onUpdate(charKey, state, this.stateStringForCV(state, future));
39
- }).bind(this);
40
- }
41
- async onSetTargetState(value) {
42
- const target = this.fromCVState(value);
43
- if (target === undefined) {
44
- return;
45
- }
46
- this.onSet(HKCharacteristicKey.TargetHeatingCoolingState, value, target, 'topicSetTargetHeatingCoolingState', this.stateStringForCV(value, true));
47
- }
48
- async onSetTemperature(value) {
49
- const temperature = this.temperatureFromCV(value);
50
- const logString = strings.thermostat.temperatureTargetFuture.replace('%d°%s', `${temperature}°${this.temperatureUnits}`);
51
- this.onSet(HKCharacteristicKey.TargetTemperature, value, temperature, 'topicSetTargetTemperature', logString);
52
- }
53
- async onSetHumidity(value) {
54
- const logString = strings.thermostat.humidityFuture.replace('%d', value.toString());
55
- this.onSet(HKCharacteristicKey.TargetRelativeHumidity, value, value, 'topicSetTargetRelativeHumidity', logString);
56
- }
57
- fromCVState(value) {
58
- let primative = undefined;
59
- this.STATE_MAP.forEach((test, key) => {
60
- if (value === test) {
61
- primative = this.getPrimitiveValue(key);
62
- }
63
- });
64
- if (primative === undefined) {
65
- this.log.error(strings.thermostat.badValue, this.name, `'${value}'`);
66
- }
67
- return primative;
68
- }
69
- toCVState(value) {
70
- switch (value) {
71
- case this.getPrimitiveValue('valueModeAuto', false):
72
- return this.STATE_MAP.get('valueModeAuto');
73
- case this.getPrimitiveValue('valueModeCool', false):
74
- return this.STATE_MAP.get('valueModeCool');
75
- case this.getPrimitiveValue('valueModeHeat', false):
76
- return this.STATE_MAP.get('valueModeHeat');
77
- case this.getPrimitiveValue('valueModeOff', false):
78
- return this.STATE_MAP.get('valueModeOff');
79
- }
80
- this.logIfDesired(strings.thermostat.unknownValue, `'${value}'`);
81
- }
82
- stateStringForCV(state, future = false) {
83
- switch (state) {
84
- case this.Characteristic.TargetHeatingCoolingState.AUTO:
85
- return strings.thermostat.stateAutoFuture;
86
- case this.Characteristic.TargetHeatingCoolingState.COOL:
87
- return future ? strings.thermostat.stateCoolFuture : strings.thermostat.stateCool;
88
- case this.Characteristic.TargetHeatingCoolingState.HEAT:
89
- return future ? strings.thermostat.stateHeatFuture : strings.thermostat.stateHeat;
90
- case this.Characteristic.TargetHeatingCoolingState.OFF:
91
- return future ? strings.thermostat.stateOffFuture : strings.thermostat.stateOff;
92
- default:
93
- return strings.thermostat.stateUnknown;
94
- }
36
+ this.setup(HKCharacteristicKey.CurrentHeatingCoolingState, stateMap.get(validCurrentStates[0]), 'topicGetCurrentHeatingCoolingState', this.bindOnUpdateState(HKCharacteristicKey.CurrentHeatingCoolingState, stateMap, currentStrings, strings.thermostat.stateUnknown), true)?.setProps({ validValues: validCurrentStates.map((key) => stateMap.get(key)) });
37
+ this.setup(HKCharacteristicKey.TargetTemperature, DEFAULT_TEMPERATURE, 'topicGetTargetTemperature', this.bindOnUpdateTemperature(dependency.config, HKCharacteristicKey.TargetTemperature, strings.thermostat.temperatureTarget), true, 'topicSetTargetTemperature', this.bindOnSetTemperature(HKCharacteristicKey.TargetTemperature, 'topicSetTargetTemperature', strings.thermostat.temperatureTargetFuture));
38
+ this.setup(HKCharacteristicKey.CurrentRelativeHumidity, 0, 'topicGetCurrentRelativeHumidity', this.bindOnUpdateNumeric(HKCharacteristicKey.CurrentRelativeHumidity, strings.climate.humidityUpdate, (value) => {
39
+ this.recordHistory(HistoryType.WEATHER, { humidity: value });
40
+ }), false);
41
+ this.setup(HKCharacteristicKey.TargetRelativeHumidity, 0, 'topicGetTargetRelativeHumidity', this.bindOnUpdateNumeric(HKCharacteristicKey.TargetRelativeHumidity, strings.thermostat.humidityFuture), false, 'topicSetTargetRelativeHumidity', this.bindOnSetNumeric(HKCharacteristicKey.TargetRelativeHumidity, 'topicSetTargetRelativeHumidity', strings.thermostat.humidityFuture));
95
42
  }
96
43
  }
97
44
  //# sourceMappingURL=thermostat.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"thermostat.js","sourceRoot":"","sources":["../../../src/accessory/climate/thermostat.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"thermostat.js","sourceRoot":"","sources":["../../../src/accessory/climate/thermostat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE3F,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGrD,MAAM,OAAO,mBAAoB,SAAQ,2BAA6C;IAE1E,gBAAgB;QACxB,OAAO,aAAa,CAAC,UAAU,CAAC;IAClC,CAAC;IAED,YAAY,UAAqD;QAC/D,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,sCAAsC,EAAE,CAAC;QAE9C,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAiC;YACvD,CAAC,cAAc,EAAE,UAAU,CAAC,cAAc,CAAC,yBAAyB,CAAC,GAAG,CAAC;YACzE,CAAC,eAAe,EAAE,UAAU,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI,CAAC;YAC3E,CAAC,eAAe,EAAE,UAAU,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI,CAAC;YAC3E,CAAC,eAAe,EAAE,UAAU,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI,CAAC;SAC5E,CAAC,CAAC;QAEH,MAAM,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,SAAS,CAAC,CAAC;QAClH,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,KAAK,eAAe,CAAC,EAAE,CAAC;YACnH,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5D,OAAO;QACT,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC;YAC5B,CAAC,UAAU,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC;YAC9F,CAAC,UAAU,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC;YAC9F,CAAC,UAAU,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC;YAC9F,CAAC,UAAU,CAAC,cAAc,CAAC,yBAAyB,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC;SAC7F,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,yBAAyB,EAAE,QAAQ,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAE,EAC3F,mCAAmC,EACnC,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,yBAAyB,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,EAC/H,IAAI,EACJ,mCAAmC,EACnC,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,yBAAyB,EAAE,mCAAmC,EACpG,QAAQ,EAAE,aAAa,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CACxD,EAAE,QAAQ,CAAC,EAAE,WAAW,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,EAAE,CAAC,CAAC;QAEjF,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC;YAC7B,CAAC,UAAU,CAAC,cAAc,CAAC,0BAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC;YACzF,CAAC,UAAU,CAAC,cAAc,CAAC,0BAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC;YACzF,CAAC,UAAU,CAAC,cAAc,CAAC,0BAA0B,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC;SACxF,CAAC,CAAC;QAEH,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,eAAe,CAAC,CAAC;QACtF,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,0BAA0B,EAAE,QAAQ,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAE,EAC7F,oCAAoC,EACpC,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,0BAA0B,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,EACjI,IAAI,CAAC,EAAE,QAAQ,CAAC,EAAE,WAAW,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,EAAE,CAAC,CAAC;QAExF,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,iBAAiB,EAAE,mBAAmB,EACnE,2BAA2B,EAC3B,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,MAAM,EAAE,mBAAmB,CAAC,iBAAiB,EAAE,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAC5H,IAAI,EACJ,2BAA2B,EAC3B,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,iBAAiB,EAAE,2BAA2B,EAAE,OAAO,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAC1I,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,uBAAuB,EAAE,CAAC,EACvD,iCAAiC,EAAE,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,uBAAuB,EAAE,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE;YACjJ,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAE,CAAC;QAChE,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QAEb,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,CAAC,EACtD,gCAAgC,EAAE,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,KAAK,EAChJ,gCAAgC,EAChC,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,gCAAgC,EAAE,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CACvI,CAAC;IACJ,CAAC;CACF"}
@@ -2,14 +2,6 @@ import { LockMechanismAccessory } from './lock.js';
2
2
  import { AccessoryType } from '../model/enums.js';
3
3
  import { GarageDoorConfig, MQTTAccessoryDependency } from '../model/types.js';
4
4
  export declare class GarageDoorAccessory extends LockMechanismAccessory<GarageDoorConfig> {
5
- private readonly STATE_MAP;
6
- constructor(dependency: MQTTAccessoryDependency<GarageDoorConfig>);
7
5
  protected getAccessoryType(): AccessoryType;
8
- private onCurrentDoorStateUpdate;
9
- private onTargetDoorStateUpdate;
10
- private onSetTargetDoorState;
11
- private onObstructionUpdate;
12
- private toCVState;
13
- private fromCVState;
14
- private stateStringForCV;
6
+ constructor(dependency: MQTTAccessoryDependency<GarageDoorConfig>);
15
7
  }
@@ -3,108 +3,42 @@ import { strings } from '../i18n/i18n.js';
3
3
  import { AccessoryType, HKCharacteristicKey } from '../model/enums.js';
4
4
  import { LogType } from '../tools/log.js';
5
5
  export class GarageDoorAccessory extends LockMechanismAccessory {
6
- STATE_MAP;
6
+ getAccessoryType() {
7
+ return AccessoryType.GarageDoorOpener;
8
+ }
7
9
  constructor(dependency) {
8
10
  super(dependency, false);
9
- this.STATE_MAP = new Map([
11
+ const stateMap = new Map([
10
12
  ['valueDoorStateOpen', dependency.Characteristic.CurrentDoorState.OPEN],
11
13
  ['valueDoorStateClosed', dependency.Characteristic.CurrentDoorState.CLOSED],
12
14
  ['valueDoorStateOpening', dependency.Characteristic.CurrentDoorState.OPENING],
13
15
  ['valueDoorStateClosing', dependency.Characteristic.CurrentDoorState.CLOSING],
14
16
  ['valueDoorStateStopped', dependency.Characteristic.CurrentDoorState.STOPPED],
15
17
  ]);
16
- const validCurrentStates = Array.from(this.STATE_MAP.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
18
+ const currentStateStrings = new Map([
19
+ [dependency.Characteristic.CurrentDoorState.OPEN, strings.garage.stateOpen],
20
+ [dependency.Characteristic.CurrentDoorState.CLOSED, strings.garage.stateClosed],
21
+ [dependency.Characteristic.CurrentDoorState.OPENING, strings.garage.stateOpening],
22
+ [dependency.Characteristic.CurrentDoorState.CLOSING, strings.garage.stateClosing],
23
+ [dependency.Characteristic.CurrentDoorState.STOPPED, strings.garage.stateStopped],
24
+ ]);
25
+ const targetStateStrings = new Map([
26
+ [dependency.Characteristic.TargetDoorState.OPEN, strings.garage.stateOpenFuture],
27
+ [dependency.Characteristic.TargetDoorState.CLOSED, strings.garage.stateClosedFuture],
28
+ ]);
29
+ const validCurrentStates = Array.from(stateMap.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
17
30
  if (validCurrentStates.length === 0) {
18
31
  this.log.error(strings.garage.noCurrentStateValues, this.name);
19
32
  return;
20
33
  }
21
- this.setup(HKCharacteristicKey.CurrentDoorState, dependency.Characteristic.CurrentDoorState.CLOSED, 'topicGetCurrentDoorState', this.onCurrentDoorStateUpdate.bind(this), true)?.setProps({ validValues: validCurrentStates.map((key) => this.STATE_MAP.get(key)) });
34
+ this.setup(HKCharacteristicKey.CurrentDoorState, dependency.Characteristic.CurrentDoorState.CLOSED, 'topicGetCurrentDoorState', this.bindOnUpdateState(HKCharacteristicKey.CurrentDoorState, stateMap, currentStateStrings, strings.garage.unknownValue), true)?.setProps({ validValues: validCurrentStates.map((key) => stateMap.get(key)) });
22
35
  const validTargetStates = validCurrentStates.filter((key) => ['valueDoorStateOpen', 'valueDoorStateClosed'].includes(key));
23
36
  if (validTargetStates.length === 0) {
24
37
  this.log.error(strings.garage.noTargetStateValues, this.name);
25
38
  return;
26
39
  }
27
- this.setup(HKCharacteristicKey.TargetDoorState, dependency.Characteristic.TargetDoorState.CLOSED, 'topicGetTargetDoorState', this.onTargetDoorStateUpdate.bind(this), true, 'topicSetTargetDoorState', this.onSetTargetDoorState.bind(this))?.setProps({ validValues: validTargetStates.map((key) => this.STATE_MAP.get(key)) });
28
- this.setup(HKCharacteristicKey.ObstructionDetected, false, 'topicGetObstructionDetected', this.onObstructionUpdate.bind(this), true);
29
- }
30
- getAccessoryType() {
31
- return AccessoryType.GarageDoorOpener;
32
- }
33
- async onCurrentDoorStateUpdate(topic, value) {
34
- const current = this.toCVState(value);
35
- if (current === undefined) {
36
- return;
37
- }
38
- this.onUpdate(HKCharacteristicKey.CurrentDoorState, current, this.stateStringForCV(current));
39
- }
40
- async onTargetDoorStateUpdate(topic, value) {
41
- const target = this.toCVState(value);
42
- if (target === undefined) {
43
- return;
44
- }
45
- this.onUpdate(HKCharacteristicKey.TargetDoorState, target, this.stateStringForCV(target, true));
46
- }
47
- async onSetTargetDoorState(value) {
48
- const target = this.fromCVState(value);
49
- if (target === undefined) {
50
- return;
51
- }
52
- this.onSet(HKCharacteristicKey.TargetDoorState, value, target, 'topicSetTargetDoorState', this.stateStringForCV(value, true));
53
- }
54
- async onObstructionUpdate(topic, value) {
55
- const obstructed = value === this.getPrimitiveValue('valueDoorObstructed');
56
- if (!this.onUpdate(HKCharacteristicKey.ObstructionDetected, obstructed)) {
57
- return;
58
- }
59
- if (obstructed) {
60
- this.logIfDesired(LogType.ERROR, strings.garage.obstructed);
61
- }
62
- else {
63
- this.logIfDesired(strings.garage.unobstructed);
64
- }
65
- }
66
- toCVState(value) {
67
- switch (value) {
68
- case this.getPrimitiveValue('valueDoorStateOpen', false):
69
- return this.STATE_MAP.get('valueDoorStateOpen');
70
- case this.getPrimitiveValue('valueDoorStateClosed', false):
71
- return this.STATE_MAP.get('valueDoorStateClosed');
72
- case this.getPrimitiveValue('valueDoorStateOpening', false):
73
- return this.STATE_MAP.get('valueDoorStateOpening');
74
- case this.getPrimitiveValue('valueDoorStateClosing', false):
75
- return this.STATE_MAP.get('valueDoorStateClosing');
76
- case this.getPrimitiveValue('valueDoorStateStopped', false):
77
- return this.STATE_MAP.get('valueDoorStateStopped');
78
- }
79
- this.logIfDesired(strings.garage.unknownValue, `'${value}'`);
80
- }
81
- fromCVState(value) {
82
- let primative = undefined;
83
- this.STATE_MAP.forEach((test, key) => {
84
- if (value === test) {
85
- primative = this.getPrimitiveValue(key);
86
- }
87
- });
88
- if (primative === undefined) {
89
- this.log.error(strings.garage.badValue, this.name, `'${value}'`);
90
- }
91
- return primative;
92
- }
93
- stateStringForCV(state, future = false) {
94
- switch (state) {
95
- case this.Characteristic.CurrentDoorState.OPEN:
96
- return future ? strings.garage.stateOpenFuture : strings.garage.stateOpen;
97
- case this.Characteristic.CurrentDoorState.CLOSED:
98
- return future ? strings.garage.stateClosedFuture : strings.garage.stateClosed;
99
- case this.Characteristic.CurrentDoorState.OPENING:
100
- return strings.garage.stateOpening;
101
- case this.Characteristic.CurrentDoorState.CLOSING:
102
- return strings.garage.stateClosing;
103
- case this.Characteristic.CurrentDoorState.STOPPED:
104
- return strings.garage.stateStopped;
105
- default:
106
- return strings.garage.stateUnknown;
107
- }
40
+ this.setup(HKCharacteristicKey.TargetDoorState, dependency.Characteristic.TargetDoorState.CLOSED, 'topicGetTargetDoorState', this.bindOnUpdateState(HKCharacteristicKey.TargetDoorState, stateMap, targetStateStrings, strings.garage.unknownValue), true, 'topicSetTargetDoorState', this.bindOnSetState(HKCharacteristicKey.TargetDoorState, 'topicSetTargetDoorState', stateMap, targetStateStrings, strings.garage.badValue))?.setProps({ validValues: validTargetStates.map((key) => stateMap.get(key)) });
41
+ this.setup(HKCharacteristicKey.ObstructionDetected, false, 'topicGetObstructionDetected', this.bindOnUpdateBooleanSingle(HKCharacteristicKey.ObstructionDetected, 'valueDoorObstructed', strings.garage.obstructed, strings.garage.unobstructed, LogType.ERROR), true);
108
42
  }
109
43
  }
110
44
  //# sourceMappingURL=garage.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"garage.js","sourceRoot":"","sources":["../../src/accessory/garage.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"garage.js","sourceRoot":"","sources":["../../src/accessory/garage.ts"],"names":[],"mappings":"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"}
@@ -2,13 +2,9 @@ import { BaseAccessory } from './abstract/base.js';
2
2
  import { AccessoryType } from '../model/enums.js';
3
3
  import { LockConfig, MQTTAccessoryDependency } from '../model/types.js';
4
4
  export declare class LockMechanismAccessory<C extends LockConfig = LockConfig> extends BaseAccessory<C> {
5
- constructor(dependency: MQTTAccessoryDependency<C>, requireTopics?: boolean);
6
5
  protected getAccessoryType(): AccessoryType;
6
+ constructor(dependency: MQTTAccessoryDependency<C>, requireTopics?: boolean);
7
7
  private onCurrentStateUpdate;
8
- private onTargetStateUpdate;
9
- private onSetTargetState;
10
8
  private currentStateFromValue;
11
- private targetStateFromValue;
12
- private valueFromTargetState;
13
9
  private stringForState;
14
10
  }