homebridge-dummy 1.1.0-beta.0 → 1.1.0-beta.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +24 -14
- package/README.md +84 -19
- package/config.schema.json +263 -98
- package/dist/accessory/base.d.ts +8 -4
- package/dist/accessory/base.js +26 -18
- package/dist/accessory/base.js.map +1 -1
- package/dist/accessory/helpers.js +3 -0
- package/dist/accessory/helpers.js.map +1 -1
- package/dist/accessory/lock.d.ts +2 -1
- package/dist/accessory/lock.js +23 -5
- package/dist/accessory/lock.js.map +1 -1
- package/dist/accessory/onoff/lightbulb.d.ts +2 -2
- package/dist/accessory/onoff/lightbulb.js +5 -0
- package/dist/accessory/onoff/lightbulb.js.map +1 -1
- package/dist/accessory/onoff/onoff.d.ts +4 -4
- package/dist/accessory/onoff/onoff.js +24 -8
- package/dist/accessory/onoff/onoff.js.map +1 -1
- package/dist/accessory/position/position.d.ts +2 -1
- package/dist/accessory/position/position.js +22 -4
- package/dist/accessory/position/position.js.map +1 -1
- package/dist/accessory/sensor.d.ts +11 -11
- package/dist/accessory/sensor.js +44 -30
- package/dist/accessory/sensor.js.map +1 -1
- package/dist/accessory/thermostat.d.ts +28 -0
- package/dist/accessory/thermostat.js +151 -0
- package/dist/accessory/thermostat.js.map +1 -0
- package/dist/homebridge-ui/public/index.html +2 -2
- package/dist/homebridge-ui/public/ui.js +1 -1
- package/dist/i18n/en.d.ts +37 -2
- package/dist/i18n/en.js +44 -9
- package/dist/i18n/en.js.map +1 -1
- package/dist/i18n/i18n.d.ts +37 -2
- package/dist/i18n/template.d.ts +37 -2
- package/dist/i18n/zz.d.ts +37 -2
- package/dist/model/types.d.ts +37 -1
- package/dist/model/types.js +19 -0
- package/dist/model/types.js.map +1 -1
- package/dist/timeout/schedule.d.ts +14 -0
- package/dist/timeout/schedule.js +68 -0
- package/dist/timeout/schedule.js.map +1 -0
- package/dist/timeout/timeout.d.ts +23 -0
- package/dist/timeout/timeout.js +91 -0
- package/dist/timeout/timeout.js.map +1 -0
- package/dist/timeout/timer.d.ts +10 -0
- package/dist/timeout/timer.js +29 -0
- package/dist/timeout/timer.js.map +1 -0
- package/dist/tools/configMigration.js +2 -2
- package/dist/tools/configMigration.js.map +1 -1
- package/dist/tools/storage.d.ts +1 -0
- package/dist/tools/storage.js +1 -0
- package/dist/tools/storage.js.map +1 -1
- package/dist/tools/temperature.d.ts +3 -0
- package/dist/tools/temperature.js +14 -0
- package/dist/tools/temperature.js.map +1 -0
- package/dist/tools/validation.d.ts +2 -0
- package/dist/tools/validation.js +7 -0
- package/dist/tools/validation.js.map +1 -1
- package/package.json +21 -3
- package/dist/model/timer.d.ts +0 -12
- package/dist/model/timer.js +0 -62
- package/dist/model/timer.js.map +0 -1
package/dist/accessory/lock.d.ts
CHANGED
|
@@ -10,6 +10,7 @@ export declare class LockAccessory extends DummyAccessory<LockConfig> {
|
|
|
10
10
|
private get defaultLockState();
|
|
11
11
|
protected getState(): Promise<CharacteristicValue>;
|
|
12
12
|
protected setState(value: CharacteristicValue): Promise<void>;
|
|
13
|
-
|
|
13
|
+
schedule(): Promise<void>;
|
|
14
|
+
reset(): Promise<void>;
|
|
14
15
|
protected logLockState(value: CharacteristicValue): void;
|
|
15
16
|
}
|
package/dist/accessory/lock.js
CHANGED
|
@@ -47,7 +47,7 @@ export class LockAccessory extends DummyAccessory {
|
|
|
47
47
|
}
|
|
48
48
|
else {
|
|
49
49
|
if (this.state !== this.defaultLockState) {
|
|
50
|
-
this.startTimer(
|
|
50
|
+
this.startTimer();
|
|
51
51
|
}
|
|
52
52
|
else {
|
|
53
53
|
this.cancelTimer();
|
|
@@ -55,11 +55,29 @@ export class LockAccessory extends DummyAccessory {
|
|
|
55
55
|
}
|
|
56
56
|
this.accessoryService.updateCharacteristic(this.Characteristic.LockTargetState, this.state);
|
|
57
57
|
this.accessoryService.updateCharacteristic(this.Characteristic.LockCurrentState, this.state);
|
|
58
|
+
if (this.sensor) {
|
|
59
|
+
if (!this.sensor.timerControlled) {
|
|
60
|
+
this.sensor.active = this.state !== this.defaultLockState;
|
|
61
|
+
}
|
|
62
|
+
else if (this.state !== this.defaultLockState) {
|
|
63
|
+
this.sensor.active = false;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
58
66
|
}
|
|
59
|
-
async
|
|
60
|
-
|
|
61
|
-
this.
|
|
62
|
-
|
|
67
|
+
async schedule() {
|
|
68
|
+
if (this.state === this.defaultLockState) {
|
|
69
|
+
const opposite = this.state === this.Characteristic.LockTargetState.SECURED ?
|
|
70
|
+
this.Characteristic.LockTargetState.UNSECURED : this.Characteristic.LockTargetState.SECURED;
|
|
71
|
+
await this.setState(opposite);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
async reset() {
|
|
75
|
+
if (this.state !== this.defaultLockState) {
|
|
76
|
+
await this.setState(this.defaultLockState);
|
|
77
|
+
if (this.sensor?.timerControlled) {
|
|
78
|
+
this.sensor.active = true;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
63
81
|
}
|
|
64
82
|
logLockState(value) {
|
|
65
83
|
const message = value === this.Characteristic.LockTargetState.SECURED ?
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock.js","sourceRoot":"","sources":["../../src/accessory/lock.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"lock.js","sourceRoot":"","sources":["../../src/accessory/lock.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,6 @@ export declare class LightbulbAccessory extends OnOffAccessory<LightbulbConfig>
|
|
|
10
10
|
protected getAccessoryType(): AccessoryType;
|
|
11
11
|
private initializeBrightness;
|
|
12
12
|
logOnState(value: CharacteristicValue): void;
|
|
13
|
-
|
|
14
|
-
|
|
13
|
+
private getBrightness;
|
|
14
|
+
private setBrightness;
|
|
15
15
|
}
|
|
@@ -2,6 +2,7 @@ import { OnOffAccessory } from './onoff.js';
|
|
|
2
2
|
import { strings } from '../../i18n/i18n.js';
|
|
3
3
|
import { AccessoryType } from '../../model/types.js';
|
|
4
4
|
import { STORAGE_KEY_SUFFIX_DEFAULT_BRIGHTNESS, storageGet, storageSet } from '../../tools/storage.js';
|
|
5
|
+
import { assertType } from '../../tools/validation.js';
|
|
5
6
|
const NO_BRIGHTNESS = -1;
|
|
6
7
|
export class LightbulbAccessory extends OnOffAccessory {
|
|
7
8
|
brightness;
|
|
@@ -42,6 +43,10 @@ export class LightbulbAccessory extends OnOffAccessory {
|
|
|
42
43
|
return this.brightness;
|
|
43
44
|
}
|
|
44
45
|
async setBrightness(value) {
|
|
46
|
+
if (!assertType(this.log, this.config.name, value, 'number')) {
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
this.startTimer();
|
|
45
50
|
if (this.brightness === value) {
|
|
46
51
|
return;
|
|
47
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lightbulb.js","sourceRoot":"","sources":["../../../src/accessory/onoff/lightbulb.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAoD,MAAM,sBAAsB,CAAC;AAGvG,OAAO,EAAE,qCAAqC,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"lightbulb.js","sourceRoot":"","sources":["../../../src/accessory/onoff/lightbulb.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,12 +4,12 @@ import { CharacteristicType, OnOffConfig, ServiceType } from '../../model/types.
|
|
|
4
4
|
import { Log } from '../../tools/log.js';
|
|
5
5
|
export declare abstract class OnOffAccessory<C extends OnOffConfig = OnOffConfig> extends DummyAccessory<C> {
|
|
6
6
|
private on;
|
|
7
|
-
private sensor?;
|
|
8
7
|
constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: C, log: Log, persistPath: string, isGrouped: boolean);
|
|
9
8
|
private initializeOn;
|
|
10
9
|
private get defaultOn();
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
10
|
+
private getOn;
|
|
11
|
+
private setOn;
|
|
12
|
+
schedule(): Promise<void>;
|
|
13
|
+
reset(): Promise<void>;
|
|
14
14
|
protected logOnState(value: CharacteristicValue): void;
|
|
15
15
|
}
|
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
import { DummyAccessory } from '../base.js';
|
|
2
|
-
import { SensorAccessory } from '../sensor.js';
|
|
3
2
|
import { strings } from '../../i18n/i18n.js';
|
|
4
3
|
import { storageGet, storageSet } from '../../tools/storage.js';
|
|
4
|
+
import { assertType } from '../../tools/validation.js';
|
|
5
5
|
export class OnOffAccessory extends DummyAccessory {
|
|
6
6
|
on;
|
|
7
|
-
sensor;
|
|
8
7
|
constructor(Service, Characteristic, accessory, config, log, persistPath, isGrouped) {
|
|
9
8
|
super(Service, Characteristic, accessory, config, log, persistPath, isGrouped);
|
|
10
9
|
this.on = this.defaultOn;
|
|
11
|
-
this.sensor = SensorAccessory.init(Service, Characteristic, accessory, this.config.name, log, this.config.disableLogging, config.sensor);
|
|
12
10
|
this.accessoryService.getCharacteristic(Characteristic.On)
|
|
13
11
|
.onGet(this.getOn.bind(this))
|
|
14
12
|
.onSet(this.setOn.bind(this));
|
|
@@ -27,6 +25,9 @@ export class OnOffAccessory extends DummyAccessory {
|
|
|
27
25
|
return this.on;
|
|
28
26
|
}
|
|
29
27
|
async setOn(value) {
|
|
28
|
+
if (!assertType(this.log, this.config.name, value, 'boolean')) {
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
30
31
|
if (this.on !== value) {
|
|
31
32
|
this.logOnState(value);
|
|
32
33
|
if (this.config.commandOn && value) {
|
|
@@ -42,19 +43,34 @@ export class OnOffAccessory extends DummyAccessory {
|
|
|
42
43
|
}
|
|
43
44
|
else {
|
|
44
45
|
if (this.on !== this.defaultOn) {
|
|
45
|
-
this.startTimer(
|
|
46
|
+
this.startTimer();
|
|
46
47
|
}
|
|
47
48
|
else {
|
|
48
49
|
this.cancelTimer();
|
|
49
50
|
}
|
|
50
51
|
}
|
|
52
|
+
this.accessoryService.updateCharacteristic(this.Characteristic.On, this.on);
|
|
51
53
|
if (this.sensor) {
|
|
52
|
-
this.sensor.
|
|
54
|
+
if (!this.sensor.timerControlled) {
|
|
55
|
+
this.sensor.active = this.on !== this.defaultOn;
|
|
56
|
+
}
|
|
57
|
+
else if (this.on !== this.defaultOn) {
|
|
58
|
+
this.sensor.active = false;
|
|
59
|
+
}
|
|
53
60
|
}
|
|
54
|
-
this.accessoryService.updateCharacteristic(this.Characteristic.On, this.on);
|
|
55
61
|
}
|
|
56
|
-
async
|
|
57
|
-
|
|
62
|
+
async schedule() {
|
|
63
|
+
if (this.on === this.defaultOn) {
|
|
64
|
+
await this.setOn(!this.on);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
async reset() {
|
|
68
|
+
if (this.on !== this.defaultOn) {
|
|
69
|
+
await this.setOn(this.defaultOn);
|
|
70
|
+
if (this.sensor?.timerControlled) {
|
|
71
|
+
this.sensor.active = true;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
58
74
|
}
|
|
59
75
|
logOnState(value) {
|
|
60
76
|
this.logIfDesired(value ? strings.accessory.onOff.stateOn : strings.accessory.onOff.stateOff, this.config.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onoff.js","sourceRoot":"","sources":["../../../src/accessory/onoff/onoff.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"onoff.js","sourceRoot":"","sources":["../../../src/accessory/onoff/onoff.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ export declare abstract class PositionAccessory<C extends PositionConfig = Posit
|
|
|
10
10
|
protected getState(): Promise<CharacteristicValue>;
|
|
11
11
|
protected getPosition(): Promise<CharacteristicValue>;
|
|
12
12
|
protected setPosition(value: CharacteristicValue): Promise<void>;
|
|
13
|
-
|
|
13
|
+
schedule(): Promise<void>;
|
|
14
|
+
reset(): Promise<void>;
|
|
14
15
|
protected logPosition(value: CharacteristicValue): void;
|
|
15
16
|
}
|
|
@@ -51,7 +51,7 @@ export class PositionAccessory extends DummyAccessory {
|
|
|
51
51
|
}
|
|
52
52
|
else {
|
|
53
53
|
if (this.position !== this.defaultPosition) {
|
|
54
|
-
this.startTimer(
|
|
54
|
+
this.startTimer();
|
|
55
55
|
}
|
|
56
56
|
else {
|
|
57
57
|
this.cancelTimer();
|
|
@@ -59,10 +59,28 @@ export class PositionAccessory extends DummyAccessory {
|
|
|
59
59
|
}
|
|
60
60
|
this.accessoryService.updateCharacteristic(this.Characteristic.TargetPosition, this.position);
|
|
61
61
|
this.accessoryService.updateCharacteristic(this.Characteristic.CurrentPosition, this.position);
|
|
62
|
+
if (this.sensor) {
|
|
63
|
+
if (!this.sensor.timerControlled) {
|
|
64
|
+
this.sensor.active = this.position !== this.defaultPosition;
|
|
65
|
+
}
|
|
66
|
+
else if (this.position !== this.defaultPosition) {
|
|
67
|
+
this.sensor.active = false;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
62
70
|
}
|
|
63
|
-
async
|
|
64
|
-
|
|
65
|
-
|
|
71
|
+
async schedule() {
|
|
72
|
+
if (this.position === this.defaultPosition) {
|
|
73
|
+
const opposite = this.position === POSITION_CLOSED ? POSITION_OPEN : POSITION_CLOSED;
|
|
74
|
+
await this.setPosition(opposite);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
async reset() {
|
|
78
|
+
if (this.position !== this.defaultPosition) {
|
|
79
|
+
await this.setPosition(this.defaultPosition);
|
|
80
|
+
if (this.sensor?.timerControlled) {
|
|
81
|
+
this.sensor.active = true;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
66
84
|
}
|
|
67
85
|
logPosition(value) {
|
|
68
86
|
const message = value === POSITION_CLOSED ? strings.accessory.position.closed : strings.accessory.position.open;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"position.js","sourceRoot":"","sources":["../../../src/accessory/position/position.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"position.js","sourceRoot":"","sources":["../../../src/accessory/position/position.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { CharacteristicType, SensorType
|
|
1
|
+
import { PlatformAccessory, Service } from 'homebridge';
|
|
2
|
+
import { CharacteristicType, SensorType, ServiceType, SensorConfig } from '../model/types.js';
|
|
3
|
+
import { Timeout } from '../timeout/timeout.js';
|
|
3
4
|
import { Log } from '../tools/log.js';
|
|
4
|
-
export declare class SensorAccessory {
|
|
5
|
-
readonly
|
|
6
|
-
readonly Characteristic
|
|
7
|
-
readonly
|
|
8
|
-
readonly log: Log;
|
|
9
|
-
readonly disableLogging?: boolean | undefined;
|
|
10
|
-
protected readonly sensorService?: Service;
|
|
5
|
+
export declare class SensorAccessory extends Timeout {
|
|
6
|
+
private readonly config;
|
|
7
|
+
private readonly Characteristic;
|
|
8
|
+
protected readonly service: Service;
|
|
11
9
|
private _active;
|
|
12
|
-
static
|
|
10
|
+
static new(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, caller: string, log: Log, disableLogging: boolean, sensor?: SensorConfig | SensorType): SensorAccessory | undefined;
|
|
13
11
|
private static removeUnwantedServices;
|
|
14
12
|
private constructor();
|
|
15
|
-
protected
|
|
13
|
+
protected get cancelString(): string;
|
|
14
|
+
private onGet;
|
|
16
15
|
private get sensorInfo();
|
|
16
|
+
get timerControlled(): boolean;
|
|
17
17
|
get active(): boolean;
|
|
18
18
|
set active(isActive: boolean);
|
|
19
19
|
}
|
package/dist/accessory/sensor.js
CHANGED
|
@@ -1,30 +1,33 @@
|
|
|
1
1
|
import { strings } from '../i18n/i18n.js';
|
|
2
|
-
import { SensorType
|
|
2
|
+
import { SensorType, SensorCharacteristic } from '../model/types.js';
|
|
3
|
+
import { Timeout } from '../timeout/timeout.js';
|
|
3
4
|
const INFO_MAP = {
|
|
4
|
-
[
|
|
5
|
-
[
|
|
6
|
-
[
|
|
7
|
-
[
|
|
8
|
-
[
|
|
9
|
-
[
|
|
10
|
-
[
|
|
5
|
+
[SensorType.CarbonDioxideSensor]: { characteristic: SensorCharacteristic.CarbonDioxideDetected, strings: strings.sensor.carbonDioxide },
|
|
6
|
+
[SensorType.CarbonMonoxideSensor]: { characteristic: SensorCharacteristic.CarbonMonoxideDetected, strings: strings.sensor.carbonMonoxide },
|
|
7
|
+
[SensorType.ContactSensor]: { characteristic: SensorCharacteristic.ContactSensorState, strings: strings.sensor.contact },
|
|
8
|
+
[SensorType.LeakSensor]: { characteristic: SensorCharacteristic.LeakDetected, strings: strings.sensor.leak },
|
|
9
|
+
[SensorType.MotionSensor]: { characteristic: SensorCharacteristic.MotionDetected, strings: strings.sensor.motion },
|
|
10
|
+
[SensorType.OccupancySensor]: { characteristic: SensorCharacteristic.OccupancyDetected, strings: strings.sensor.occupancy },
|
|
11
|
+
[SensorType.SmokeSensor]: { characteristic: SensorCharacteristic.SmokeDetected, strings: strings.sensor.smoke },
|
|
11
12
|
};
|
|
12
|
-
export class SensorAccessory {
|
|
13
|
-
|
|
13
|
+
export class SensorAccessory extends Timeout {
|
|
14
|
+
config;
|
|
14
15
|
Characteristic;
|
|
15
|
-
|
|
16
|
-
log;
|
|
17
|
-
disableLogging;
|
|
18
|
-
sensorService;
|
|
16
|
+
service;
|
|
19
17
|
_active = 0;
|
|
20
|
-
static
|
|
21
|
-
if (
|
|
22
|
-
|
|
18
|
+
static new(Service, Characteristic, accessory, caller, log, disableLogging, sensor) {
|
|
19
|
+
if (sensor) {
|
|
20
|
+
if (typeof sensor === 'string') {
|
|
21
|
+
sensor = {
|
|
22
|
+
type: sensor,
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
return new SensorAccessory(sensor, Service, Characteristic, accessory, caller, log, disableLogging);
|
|
23
26
|
}
|
|
24
27
|
SensorAccessory.removeUnwantedServices(Service, accessory);
|
|
25
28
|
}
|
|
26
29
|
static removeUnwantedServices(Service, accessory, keep) {
|
|
27
|
-
for (const type of Object.values(
|
|
30
|
+
for (const type of Object.values(SensorType)) {
|
|
28
31
|
if (type === keep) {
|
|
29
32
|
continue;
|
|
30
33
|
}
|
|
@@ -34,33 +37,44 @@ export class SensorAccessory {
|
|
|
34
37
|
}
|
|
35
38
|
}
|
|
36
39
|
}
|
|
37
|
-
constructor(
|
|
38
|
-
|
|
40
|
+
constructor(config, Service, Characteristic, accessory, caller, log, disableLogging) {
|
|
41
|
+
super(caller, log, disableLogging);
|
|
42
|
+
this.config = config;
|
|
39
43
|
this.Characteristic = Characteristic;
|
|
40
|
-
this.
|
|
41
|
-
this.log = log;
|
|
42
|
-
this.disableLogging = disableLogging;
|
|
43
|
-
this.sensorService = accessory.getService(Service[type]) || accessory.addService(Service[type]);
|
|
44
|
+
this.service = accessory.getService(Service[config.type]) || accessory.addService(Service[config.type]);
|
|
44
45
|
const characteristicInstance = Characteristic[this.sensorInfo.characteristic];
|
|
45
|
-
this.
|
|
46
|
+
this.service.getCharacteristic(characteristicInstance)
|
|
46
47
|
.onGet(this.onGet.bind(this));
|
|
47
|
-
SensorAccessory.removeUnwantedServices(Service, accessory, type);
|
|
48
|
+
SensorAccessory.removeUnwantedServices(Service, accessory, config.type);
|
|
49
|
+
}
|
|
50
|
+
get cancelString() {
|
|
51
|
+
throw new Error('Method not implemented.');
|
|
48
52
|
}
|
|
49
53
|
async onGet() {
|
|
50
54
|
return this._active;
|
|
51
55
|
}
|
|
52
56
|
get sensorInfo() {
|
|
53
|
-
return INFO_MAP[this.type];
|
|
57
|
+
return INFO_MAP[this.config.type];
|
|
58
|
+
}
|
|
59
|
+
get timerControlled() {
|
|
60
|
+
return this.config.timerControlled === true;
|
|
54
61
|
}
|
|
55
62
|
get active() {
|
|
56
63
|
return this._active === 1;
|
|
57
64
|
}
|
|
58
65
|
set active(isActive) {
|
|
66
|
+
this.reset();
|
|
67
|
+
if (this.active === isActive) {
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
59
70
|
this._active = isActive ? 1 : 0;
|
|
60
71
|
const characteristicInstance = this.Characteristic[this.sensorInfo.characteristic];
|
|
61
|
-
this.
|
|
62
|
-
|
|
63
|
-
|
|
72
|
+
this.service.updateCharacteristic(characteristicInstance, this._active);
|
|
73
|
+
this.logIfDesired(isActive ? this.sensorInfo.strings.active : this.sensorInfo.strings.inactive);
|
|
74
|
+
if (this.timerControlled && this.active) {
|
|
75
|
+
this.timeout = setTimeout(() => {
|
|
76
|
+
this.active = false;
|
|
77
|
+
}, 1000);
|
|
64
78
|
}
|
|
65
79
|
}
|
|
66
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sensor.js","sourceRoot":"","sources":["../../src/accessory/sensor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAsB,UAAU,
|
|
1
|
+
{"version":3,"file":"sensor.js","sourceRoot":"","sources":["../../src/accessory/sensor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { CharacteristicValue, PlatformAccessory } from 'homebridge';
|
|
2
|
+
import { DummyAccessory } from './base.js';
|
|
3
|
+
import { AccessoryType, CharacteristicType, ServiceType, ThermostatConfig } from '../model/types.js';
|
|
4
|
+
import { Log } from '../tools/log.js';
|
|
5
|
+
export declare class ThermostatAccessory extends DummyAccessory<ThermostatConfig> {
|
|
6
|
+
private readonly STATE_AUTO;
|
|
7
|
+
private readonly STATE_COOL;
|
|
8
|
+
private readonly STATE_HEAT;
|
|
9
|
+
private readonly STATE_OFF;
|
|
10
|
+
private state;
|
|
11
|
+
private temperature;
|
|
12
|
+
constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: ThermostatConfig, log: Log, persistPath: string, isGrouped: boolean);
|
|
13
|
+
private initializeThermostat;
|
|
14
|
+
private get defaulTemperatureStorageKey();
|
|
15
|
+
protected getAccessoryType(): AccessoryType;
|
|
16
|
+
private get defaultState();
|
|
17
|
+
private get defaultTemperature();
|
|
18
|
+
private getUnits;
|
|
19
|
+
protected getCurrentState(): Promise<CharacteristicValue>;
|
|
20
|
+
private getState;
|
|
21
|
+
private setState;
|
|
22
|
+
private getTemperature;
|
|
23
|
+
private setTemperature;
|
|
24
|
+
schedule(): Promise<void>;
|
|
25
|
+
reset(): Promise<void>;
|
|
26
|
+
protected logState(value: CharacteristicValue): void;
|
|
27
|
+
protected logTemperature(value: CharacteristicValue): void;
|
|
28
|
+
}
|
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
import { DummyAccessory } from './base.js';
|
|
2
|
+
import { strings } from '../i18n/i18n.js';
|
|
3
|
+
import { AccessoryType, DefaultThermostatState, TemperatureUnits } from '../model/types.js';
|
|
4
|
+
import { STORAGE_KEY_SUFFIX_DEFAULT_TEMPERATURE, storageGet, storageSet } from '../tools/storage.js';
|
|
5
|
+
import { fromCelsius, toCelsius } from '../tools/temperature.js';
|
|
6
|
+
import { assertType } from '../tools/validation.js';
|
|
7
|
+
const DEFAULT_TEMPERATURE = 20;
|
|
8
|
+
export class ThermostatAccessory extends DummyAccessory {
|
|
9
|
+
STATE_AUTO;
|
|
10
|
+
STATE_COOL;
|
|
11
|
+
STATE_HEAT;
|
|
12
|
+
STATE_OFF;
|
|
13
|
+
state;
|
|
14
|
+
temperature;
|
|
15
|
+
constructor(Service, Characteristic, accessory, config, log, persistPath, isGrouped) {
|
|
16
|
+
super(Service, Characteristic, accessory, config, log, persistPath, isGrouped);
|
|
17
|
+
this.STATE_AUTO = Characteristic.TargetHeatingCoolingState.AUTO;
|
|
18
|
+
this.STATE_COOL = Characteristic.TargetHeatingCoolingState.COOL;
|
|
19
|
+
this.STATE_HEAT = Characteristic.TargetHeatingCoolingState.HEAT;
|
|
20
|
+
this.STATE_OFF = Characteristic.TargetHeatingCoolingState.OFF;
|
|
21
|
+
this.state = this.defaultState;
|
|
22
|
+
this.temperature = this.defaultTemperature;
|
|
23
|
+
this.accessoryService.getCharacteristic(this.Characteristic.TemperatureDisplayUnits)
|
|
24
|
+
.onGet(this.getUnits.bind(this));
|
|
25
|
+
this.accessoryService.getCharacteristic(this.Characteristic.CurrentHeatingCoolingState)
|
|
26
|
+
.onGet(this.getCurrentState.bind(this));
|
|
27
|
+
this.accessoryService.getCharacteristic(this.Characteristic.TargetHeatingCoolingState)
|
|
28
|
+
.setProps({
|
|
29
|
+
minStep: 1,
|
|
30
|
+
validValues: [
|
|
31
|
+
this.STATE_OFF,
|
|
32
|
+
this.STATE_HEAT,
|
|
33
|
+
this.STATE_COOL,
|
|
34
|
+
this.STATE_AUTO,
|
|
35
|
+
],
|
|
36
|
+
})
|
|
37
|
+
.onGet(this.getState.bind(this))
|
|
38
|
+
.onSet(this.setState.bind(this));
|
|
39
|
+
this.accessoryService.getCharacteristic(this.Characteristic.CurrentTemperature)
|
|
40
|
+
.onGet(this.getTemperature.bind(this));
|
|
41
|
+
this.accessoryService.getCharacteristic(this.Characteristic.TargetTemperature)
|
|
42
|
+
.onGet(this.getTemperature.bind(this))
|
|
43
|
+
.onSet(this.setTemperature.bind(this));
|
|
44
|
+
this.initializeThermostat();
|
|
45
|
+
}
|
|
46
|
+
async initializeThermostat() {
|
|
47
|
+
if (this.isStateful) {
|
|
48
|
+
this.state = await storageGet(this.persistPath, this.defaultStateStorageKey) ?? this.state;
|
|
49
|
+
this.temperature = await storageGet(this.persistPath, this.defaulTemperatureStorageKey) ?? this.temperature;
|
|
50
|
+
}
|
|
51
|
+
this.accessoryService.updateCharacteristic(this.Characteristic.TargetHeatingCoolingState, this.state);
|
|
52
|
+
this.accessoryService.updateCharacteristic(this.Characteristic.TargetTemperature, this.temperature);
|
|
53
|
+
this.accessoryService.updateCharacteristic(this.Characteristic.CurrentTemperature, this.temperature);
|
|
54
|
+
}
|
|
55
|
+
get defaulTemperatureStorageKey() {
|
|
56
|
+
return `${this.identifier}:${STORAGE_KEY_SUFFIX_DEFAULT_TEMPERATURE}`;
|
|
57
|
+
}
|
|
58
|
+
getAccessoryType() {
|
|
59
|
+
return AccessoryType.Thermostat;
|
|
60
|
+
}
|
|
61
|
+
get defaultState() {
|
|
62
|
+
switch (this.config.defaultThermostatState) {
|
|
63
|
+
case DefaultThermostatState.AUTO:
|
|
64
|
+
return this.STATE_AUTO;
|
|
65
|
+
case DefaultThermostatState.COOL:
|
|
66
|
+
return this.STATE_COOL;
|
|
67
|
+
case DefaultThermostatState.HEAT:
|
|
68
|
+
return this.STATE_HEAT;
|
|
69
|
+
}
|
|
70
|
+
return this.STATE_OFF;
|
|
71
|
+
}
|
|
72
|
+
get defaultTemperature() {
|
|
73
|
+
return this.config.defaultTemperature ? toCelsius(this.config.defaultTemperature, this.config.temperatureUnits) : DEFAULT_TEMPERATURE;
|
|
74
|
+
}
|
|
75
|
+
async getUnits() {
|
|
76
|
+
return this.config.temperatureUnits === TemperatureUnits.FAHRENHEIT ?
|
|
77
|
+
this.Characteristic.TemperatureDisplayUnits.FAHRENHEIT : this.Characteristic.TemperatureDisplayUnits.CELSIUS;
|
|
78
|
+
}
|
|
79
|
+
async getCurrentState() {
|
|
80
|
+
return this.Characteristic.CurrentHeatingCoolingState.OFF;
|
|
81
|
+
}
|
|
82
|
+
async getState() {
|
|
83
|
+
return this.state;
|
|
84
|
+
}
|
|
85
|
+
async setState(value) {
|
|
86
|
+
if (this.state !== value) {
|
|
87
|
+
this.logState(value);
|
|
88
|
+
if (this.config.commandOff && value === this.STATE_OFF) {
|
|
89
|
+
this.executeCommand(this.config.commandOff);
|
|
90
|
+
}
|
|
91
|
+
else if (this.config.commandOn && this.state === this.STATE_OFF && value !== this.STATE_OFF) {
|
|
92
|
+
this.executeCommand(this.config.commandOn);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
this.state = value;
|
|
96
|
+
if (this.isStateful) {
|
|
97
|
+
await storageSet(this.persistPath, this.defaultStateStorageKey, this.state);
|
|
98
|
+
}
|
|
99
|
+
this.accessoryService.updateCharacteristic(this.Characteristic.TargetHeatingCoolingState, this.state);
|
|
100
|
+
}
|
|
101
|
+
async getTemperature() {
|
|
102
|
+
return this.temperature;
|
|
103
|
+
}
|
|
104
|
+
async setTemperature(value) {
|
|
105
|
+
if (this.temperature !== value) {
|
|
106
|
+
this.logTemperature(value);
|
|
107
|
+
if (this.config.commandTemperature) {
|
|
108
|
+
this.executeCommand(this.config.commandTemperature);
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
this.temperature = value;
|
|
112
|
+
if (this.isStateful) {
|
|
113
|
+
await storageSet(this.persistPath, this.defaulTemperatureStorageKey, this.temperature);
|
|
114
|
+
}
|
|
115
|
+
this.accessoryService.updateCharacteristic(this.Characteristic.TargetTemperature, this.temperature);
|
|
116
|
+
this.accessoryService.updateCharacteristic(this.Characteristic.CurrentTemperature, this.temperature);
|
|
117
|
+
}
|
|
118
|
+
async schedule() {
|
|
119
|
+
throw new Error(strings.accessory.thermostat.unsupportedFunction.replace('%s', `${this.schedule.name}()`));
|
|
120
|
+
}
|
|
121
|
+
async reset() {
|
|
122
|
+
throw new Error(strings.accessory.thermostat.unsupportedFunction.replace('%s', `${this.reset.name}()`));
|
|
123
|
+
}
|
|
124
|
+
logState(value) {
|
|
125
|
+
let message;
|
|
126
|
+
switch (value) {
|
|
127
|
+
case this.STATE_AUTO:
|
|
128
|
+
message = strings.accessory.thermostat.auto;
|
|
129
|
+
break;
|
|
130
|
+
case this.STATE_COOL:
|
|
131
|
+
message = strings.accessory.thermostat.cool;
|
|
132
|
+
break;
|
|
133
|
+
case this.STATE_HEAT:
|
|
134
|
+
message = strings.accessory.thermostat.heat;
|
|
135
|
+
break;
|
|
136
|
+
default:
|
|
137
|
+
message = strings.accessory.thermostat.off;
|
|
138
|
+
}
|
|
139
|
+
this.logIfDesired(message, this.config.name);
|
|
140
|
+
}
|
|
141
|
+
logTemperature(value) {
|
|
142
|
+
if (!assertType(this.log, this.config.name, value, 'number')) {
|
|
143
|
+
return;
|
|
144
|
+
}
|
|
145
|
+
const message = this.config.temperatureUnits === TemperatureUnits.FAHRENHEIT ?
|
|
146
|
+
strings.accessory.thermostat.temperatureF : strings.accessory.thermostat.temperatureC;
|
|
147
|
+
const temperature = fromCelsius(value, this.config.temperatureUnits);
|
|
148
|
+
this.logIfDesired(message, this.config.name, temperature);
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
//# sourceMappingURL=thermostat.js.map
|