homebridge-dummy 1.3.2 → 1.4.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -1
- package/README.md +36 -2
- package/config.schema.json +153 -29
- package/dist/accessory/base.d.ts +28 -8
- package/dist/accessory/base.js +53 -37
- package/dist/accessory/base.js.map +1 -1
- package/dist/accessory/group.d.ts +9 -1
- package/dist/accessory/group.js +14 -9
- package/dist/accessory/group.js.map +1 -1
- package/dist/accessory/helpers.d.ts +3 -5
- package/dist/accessory/helpers.js +12 -12
- package/dist/accessory/helpers.js.map +1 -1
- package/dist/accessory/lock.d.ts +6 -6
- package/dist/accessory/lock.js +14 -8
- package/dist/accessory/lock.js.map +1 -1
- package/dist/accessory/onoff/lightbulb.d.ts +9 -4
- package/dist/accessory/onoff/lightbulb.js +31 -4
- package/dist/accessory/onoff/lightbulb.js.map +1 -1
- package/dist/accessory/onoff/onoff.d.ts +8 -8
- package/dist/accessory/onoff/onoff.js +25 -13
- package/dist/accessory/onoff/onoff.js.map +1 -1
- package/dist/accessory/position/garage.d.ts +3 -4
- package/dist/accessory/position/garage.js +3 -3
- package/dist/accessory/position/garage.js.map +1 -1
- package/dist/accessory/position/position.d.ts +6 -6
- package/dist/accessory/position/position.js +14 -8
- package/dist/accessory/position/position.js.map +1 -1
- package/dist/accessory/sensor.d.ts +4 -5
- package/dist/accessory/sensor.js +14 -15
- package/dist/accessory/sensor.js.map +1 -1
- package/dist/accessory/thermostat.d.ts +5 -6
- package/dist/accessory/thermostat.js +17 -17
- package/dist/accessory/thermostat.js.map +1 -1
- package/dist/homebridge/platform.d.ts +1 -1
- package/dist/homebridge/platform.js +29 -12
- package/dist/homebridge/platform.js.map +1 -1
- package/dist/homebridge-ui/public/index.html +1 -1
- package/dist/homebridge-ui/public/ui.js +1 -1
- package/dist/i18n/de.d.ts +22 -0
- package/dist/i18n/en.d.ts +22 -0
- package/dist/i18n/en.js +30 -8
- package/dist/i18n/en.js.map +1 -1
- package/dist/i18n/es.d.ts +22 -0
- package/dist/i18n/i18n.d.ts +22 -0
- package/dist/i18n/ru.d.ts +22 -0
- package/dist/i18n/template.d.ts +22 -0
- package/dist/model/conditions.d.ts +14 -0
- package/dist/model/conditions.js +99 -0
- package/dist/model/conditions.js.map +1 -0
- package/dist/model/enums.d.ts +15 -4
- package/dist/model/enums.js +36 -12
- package/dist/model/enums.js.map +1 -1
- package/dist/model/types.d.ts +14 -3
- package/dist/timeout/fader.d.ts +9 -0
- package/dist/timeout/fader.js +33 -0
- package/dist/timeout/fader.js.map +1 -0
- package/dist/timeout/limiter.d.ts +2 -2
- package/dist/timeout/limiter.js +8 -8
- package/dist/timeout/limiter.js.map +1 -1
- package/dist/timeout/schedule.d.ts +3 -3
- package/dist/timeout/schedule.js +18 -18
- package/dist/timeout/schedule.js.map +1 -1
- package/dist/timeout/timeout.d.ts +6 -4
- package/dist/timeout/timeout.js +12 -7
- package/dist/timeout/timeout.js.map +1 -1
- package/dist/timeout/timer.d.ts +3 -4
- package/dist/timeout/timer.js +8 -9
- package/dist/timeout/timer.js.map +1 -1
- package/dist/tools/configMigration.js +2 -2
- package/dist/tools/configMigration.js.map +1 -1
- package/package.json +10 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/accessory/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAiB,MAAM,eAAe,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAEjC,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAExE,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/accessory/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,18 @@
|
|
|
1
1
|
import { PlatformAccessory } from 'homebridge';
|
|
2
|
+
import { ConditionManager } from '../model/conditions.js';
|
|
2
3
|
import { CharacteristicType, GroupConfig, ServiceType } from '../model/types.js';
|
|
3
4
|
import { WebhookManager } from '../model/webhook.js';
|
|
4
5
|
import { Log } from '../tools/log.js';
|
|
6
|
+
export type GroupAccessoryDependency = {
|
|
7
|
+
Service: ServiceType;
|
|
8
|
+
Characteristic: CharacteristicType;
|
|
9
|
+
platformAccessory: PlatformAccessory;
|
|
10
|
+
conditionManager: ConditionManager;
|
|
11
|
+
log: Log;
|
|
12
|
+
};
|
|
5
13
|
export declare class GroupAccessory {
|
|
6
14
|
static identifier(groupName: string): string;
|
|
7
15
|
private readonly accessories;
|
|
8
|
-
constructor(
|
|
16
|
+
constructor(dependency: GroupAccessoryDependency, config: GroupConfig, webhookManager: WebhookManager);
|
|
9
17
|
teardown(): void;
|
|
10
18
|
}
|
package/dist/accessory/group.js
CHANGED
|
@@ -6,15 +6,20 @@ export class GroupAccessory {
|
|
|
6
6
|
return `${PLATFORM_NAME}:Group:${groupName.replace(/\s+/g, '')})}`;
|
|
7
7
|
}
|
|
8
8
|
accessories = [];
|
|
9
|
-
constructor(
|
|
10
|
-
|
|
11
|
-
.setCharacteristic(Characteristic.Manufacturer, PLUGIN_ALIAS)
|
|
12
|
-
.setCharacteristic(Characteristic.Model, GroupAccessory.name)
|
|
13
|
-
.setCharacteristic(Characteristic.SerialNumber,
|
|
14
|
-
.setCharacteristic(Characteristic.FirmwareRevision, getVersion());
|
|
9
|
+
constructor(dependency, config, webhookManager) {
|
|
10
|
+
dependency.platformAccessory.getService(dependency.Service.AccessoryInformation)
|
|
11
|
+
.setCharacteristic(dependency.Characteristic.Manufacturer, PLUGIN_ALIAS)
|
|
12
|
+
.setCharacteristic(dependency.Characteristic.Model, GroupAccessory.name)
|
|
13
|
+
.setCharacteristic(dependency.Characteristic.SerialNumber, dependency.platformAccessory.UUID)
|
|
14
|
+
.setCharacteristic(dependency.Characteristic.FirmwareRevision, getVersion());
|
|
15
15
|
const keepSubtypes = new Set();
|
|
16
16
|
for (const dummyConfig of config.accessories) {
|
|
17
|
-
const
|
|
17
|
+
const accessoryDependency = {
|
|
18
|
+
...dependency,
|
|
19
|
+
config: dummyConfig,
|
|
20
|
+
isGrouped: true,
|
|
21
|
+
};
|
|
22
|
+
const dummyAccessory = createDummyAccessory(accessoryDependency);
|
|
18
23
|
if (!dummyAccessory) {
|
|
19
24
|
continue;
|
|
20
25
|
}
|
|
@@ -25,9 +30,9 @@ export class GroupAccessory {
|
|
|
25
30
|
this.accessories.push(dummyAccessory);
|
|
26
31
|
}
|
|
27
32
|
;
|
|
28
|
-
for (const service of [...
|
|
33
|
+
for (const service of [...dependency.platformAccessory.services]) {
|
|
29
34
|
if (service.subtype && !keepSubtypes.has(service.subtype)) {
|
|
30
|
-
|
|
35
|
+
dependency.platformAccessory.removeService(service);
|
|
31
36
|
}
|
|
32
37
|
}
|
|
33
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group.js","sourceRoot":"","sources":["../../src/accessory/group.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"group.js","sourceRoot":"","sources":["../../src/accessory/group.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAOpD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,UAAU,MAAM,qBAAqB,CAAC;AAU7C,MAAM,OAAO,cAAc;IAElB,MAAM,CAAC,UAAU,CAAC,SAAiB;QACxC,OAAO,GAAG,aAAa,UAAU,SAAS,CAAC,OAAO,CAAC,MAAM,EAAC,EAAE,CAAC,IAAI,CAAC;IACpE,CAAC;IAEgB,WAAW,GAAoC,EAAE,CAAC;IAEnE,YAAY,UAAoC,EAAE,MAAmB,EAAE,cAA8B;QAEnG,UAAU,CAAC,iBAAiB,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,oBAAoB,CAAE;aAC9E,iBAAiB,CAAC,UAAU,CAAC,cAAc,CAAC,YAAY,EAAE,YAAY,CAAC;aACvE,iBAAiB,CAAC,UAAU,CAAC,cAAc,CAAC,KAAK,EAAE,cAAc,CAAC,IAAI,CAAC;aACvE,iBAAiB,CAAC,UAAU,CAAC,cAAc,CAAC,YAAY,EAAE,UAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC;aAC5F,iBAAiB,CAAC,UAAU,CAAC,cAAc,CAAC,gBAAgB,EAAE,UAAU,EAAE,CAAC,CAAC;QAE/E,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;QAEvC,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YAE7C,MAAM,mBAAmB,GAA0C;gBACjE,GAAG,UAAU;gBACb,MAAM,EAAE,WAAW;gBACnB,SAAS,EAAE,IAAI;aAChB,CAAC;YAEF,MAAM,cAAc,GAAG,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;YACjE,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,SAAS;YACX,CAAC;YAED,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;gBAC7B,cAAc,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;YACnD,CAAC;YAED,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,OAAQ,CAAC,CAAC;YAC1C,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACxC,CAAC;QAAA,CAAC;QAEF,KAAK,MAAM,OAAO,IAAI,CAAC,GAAG,UAAU,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjE,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC1D,UAAU,CAAC,iBAAiB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;IACH,CAAC;IAEM,QAAQ;QACb,IAAI,CAAC,WAAW,CAAC,OAAO,CAAE,SAAS,CAAC,EAAE;YACpC,SAAS,CAAC,QAAQ,EAAE,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
import { Log } from '../tools/log.js';
|
|
5
|
-
export declare function createDummyAccessory(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: DummyConfig, log: Log, isGrouped?: boolean): DummyAccessory<DummyConfig> | null;
|
|
1
|
+
import { DummyAccessory, DummyAccessoryDependency } from './base.js';
|
|
2
|
+
import { DummyConfig } from '../model/types.js';
|
|
3
|
+
export declare function createDummyAccessory(dependency: DummyAccessoryDependency<DummyConfig>): DummyAccessory<DummyConfig> | null;
|
|
@@ -9,28 +9,28 @@ import { ThermostatAccessory } from './thermostat.js';
|
|
|
9
9
|
import { WindowAccessory } from './position/window.js';
|
|
10
10
|
import { strings } from '../i18n/i18n.js';
|
|
11
11
|
import { AccessoryType } from '../model/enums.js';
|
|
12
|
-
export function createDummyAccessory(
|
|
13
|
-
switch (config.type) {
|
|
12
|
+
export function createDummyAccessory(dependency) {
|
|
13
|
+
switch (dependency.config.type) {
|
|
14
14
|
case AccessoryType.Door:
|
|
15
|
-
return new DoorAccessory(
|
|
15
|
+
return new DoorAccessory(dependency);
|
|
16
16
|
case AccessoryType.GarageDoorOpener:
|
|
17
|
-
return new GarageDoorAccessory(
|
|
17
|
+
return new GarageDoorAccessory(dependency);
|
|
18
18
|
case AccessoryType.Lightbulb:
|
|
19
|
-
return new LightbulbAccessory(
|
|
19
|
+
return new LightbulbAccessory(dependency);
|
|
20
20
|
case AccessoryType.LockMechanism:
|
|
21
|
-
return new LockAccessory(
|
|
21
|
+
return new LockAccessory(dependency);
|
|
22
22
|
case AccessoryType.Outlet:
|
|
23
|
-
return new OutletAccessory(
|
|
23
|
+
return new OutletAccessory(dependency);
|
|
24
24
|
case AccessoryType.Switch:
|
|
25
|
-
return new SwitchAccessory(
|
|
25
|
+
return new SwitchAccessory(dependency);
|
|
26
26
|
case AccessoryType.Thermostat:
|
|
27
|
-
return new ThermostatAccessory(
|
|
27
|
+
return new ThermostatAccessory(dependency);
|
|
28
28
|
case AccessoryType.Window:
|
|
29
|
-
return new WindowAccessory(
|
|
29
|
+
return new WindowAccessory(dependency);
|
|
30
30
|
case AccessoryType.WindowCovering:
|
|
31
|
-
return new BlindAccessory(
|
|
31
|
+
return new BlindAccessory(dependency);
|
|
32
32
|
default:
|
|
33
|
-
log.error(strings.startup.unsupportedType, `'${config.type}'`);
|
|
33
|
+
dependency.log.error(strings.startup.unsupportedType, `'${dependency.config.type}'`);
|
|
34
34
|
return null;
|
|
35
35
|
}
|
|
36
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/accessory/helpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/accessory/helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGlD,MAAM,UAAU,oBAAoB,CAAC,UAAiD;IAEpF,QAAO,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAChC,KAAK,aAAa,CAAC,IAAI;YACrB,OAAO,IAAI,aAAa,CAAC,UAAU,CAAC,CAAC;QACvC,KAAK,aAAa,CAAC,gBAAgB;YACjC,OAAO,IAAI,mBAAmB,CAAC,UAAU,CAAC,CAAC;QAC7C,KAAK,aAAa,CAAC,SAAS;YAC1B,OAAO,IAAI,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAC5C,KAAK,aAAa,CAAC,aAAa;YAC9B,OAAO,IAAI,aAAa,CAAC,UAAU,CAAC,CAAC;QACvC,KAAK,aAAa,CAAC,MAAM;YACvB,OAAO,IAAI,eAAe,CAAC,UAAU,CAAC,CAAC;QACzC,KAAK,aAAa,CAAC,MAAM;YACvB,OAAO,IAAI,eAAe,CAAC,UAAU,CAAC,CAAC;QACzC,KAAK,aAAa,CAAC,UAAU;YAC3B,OAAO,IAAI,mBAAmB,CAAC,UAAU,CAAC,CAAC;QAC7C,KAAK,aAAa,CAAC,MAAM;YACvB,OAAO,IAAI,eAAe,CAAC,UAAU,CAAC,CAAC;QACzC,KAAK,aAAa,CAAC,cAAc;YAC/B,OAAO,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;QACxC;YACE,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;YACrF,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
|
package/dist/accessory/lock.d.ts
CHANGED
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
import { CharacteristicValue
|
|
2
|
-
import { DummyAccessory } from './base.js';
|
|
1
|
+
import { CharacteristicValue } from 'homebridge';
|
|
2
|
+
import { DummyAccessory, DummyAccessoryDependency } from './base.js';
|
|
3
3
|
import { AccessoryType } from '../model/enums.js';
|
|
4
|
-
import {
|
|
4
|
+
import { LockConfig } from '../model/types.js';
|
|
5
5
|
import { Webhook } from '../model/webhook.js';
|
|
6
|
-
import { Log } from '../tools/log.js';
|
|
7
6
|
export declare class LockAccessory extends DummyAccessory<LockConfig> {
|
|
8
7
|
private state;
|
|
9
|
-
constructor(
|
|
8
|
+
constructor(dependency: DummyAccessoryDependency<LockConfig>);
|
|
10
9
|
private initializeState;
|
|
11
10
|
getAccessoryType(): AccessoryType;
|
|
12
11
|
webhooks(): Webhook[];
|
|
13
12
|
private get defaultLockState();
|
|
13
|
+
private registerStateChange;
|
|
14
14
|
protected getState(): Promise<CharacteristicValue>;
|
|
15
15
|
protected setState(value: CharacteristicValue): Promise<void>;
|
|
16
|
-
|
|
16
|
+
trigger(): Promise<void>;
|
|
17
17
|
reset(): Promise<void>;
|
|
18
18
|
private logTemplateForCV;
|
|
19
19
|
protected logLockState(value: CharacteristicValue): void;
|
package/dist/accessory/lock.js
CHANGED
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
import { DummyAccessory } from './base.js';
|
|
2
2
|
import { strings } from '../i18n/i18n.js';
|
|
3
|
-
import { AccessoryType,
|
|
3
|
+
import { AccessoryType, LockState, isValidLockState, printableValues, WebhookCommand } from '../model/enums.js';
|
|
4
4
|
import { Webhook } from '../model/webhook.js';
|
|
5
5
|
import { storageGet_Deprecated, Storage } from '../tools/storage.js';
|
|
6
6
|
export class LockAccessory extends DummyAccessory {
|
|
7
7
|
state;
|
|
8
|
-
constructor(
|
|
9
|
-
super(
|
|
8
|
+
constructor(dependency) {
|
|
9
|
+
super(dependency);
|
|
10
10
|
if (!isValidLockState(this.config.defaultLockState)) {
|
|
11
|
-
this.log.warning(strings.lock.badDefault, this.name, `'${config.defaultLockState}'`, printableValues(
|
|
11
|
+
this.log.warning(strings.lock.badDefault, this.name, `'${dependency.config.defaultLockState}'`, printableValues(LockState));
|
|
12
12
|
}
|
|
13
13
|
this.state = this.defaultLockState;
|
|
14
|
-
this.accessoryService.getCharacteristic(Characteristic.LockTargetState)
|
|
14
|
+
this.accessoryService.getCharacteristic(dependency.Characteristic.LockTargetState)
|
|
15
15
|
.onGet(this.getState.bind(this))
|
|
16
16
|
.onSet(this.setState.bind(this));
|
|
17
|
-
this.accessoryService.getCharacteristic(Characteristic.LockCurrentState)
|
|
17
|
+
this.accessoryService.getCharacteristic(dependency.Characteristic.LockCurrentState)
|
|
18
18
|
.onGet(this.getState.bind(this));
|
|
19
19
|
this.initializeState();
|
|
20
20
|
}
|
|
@@ -22,10 +22,12 @@ export class LockAccessory extends DummyAccessory {
|
|
|
22
22
|
if (!this.isStateful) {
|
|
23
23
|
this.accessoryService.updateCharacteristic(this.Characteristic.LockTargetState, this.state);
|
|
24
24
|
this.accessoryService.updateCharacteristic(this.Characteristic.LockCurrentState, this.state);
|
|
25
|
+
await this.registerStateChange();
|
|
25
26
|
return;
|
|
26
27
|
}
|
|
27
28
|
const state = await storageGet_Deprecated(this.defaultStateStorageKey);
|
|
28
29
|
if (state === undefined) {
|
|
30
|
+
await this.registerStateChange();
|
|
29
31
|
return;
|
|
30
32
|
}
|
|
31
33
|
await this.setState(state);
|
|
@@ -42,9 +44,12 @@ export class LockAccessory extends DummyAccessory {
|
|
|
42
44
|
];
|
|
43
45
|
}
|
|
44
46
|
get defaultLockState() {
|
|
45
|
-
return this.config.defaultLockState ===
|
|
47
|
+
return this.config.defaultLockState === LockState.UNLOCKED ?
|
|
46
48
|
this.Characteristic.LockTargetState.UNSECURED : this.Characteristic.LockTargetState.SECURED;
|
|
47
49
|
}
|
|
50
|
+
async registerStateChange() {
|
|
51
|
+
await this.onStateChange(this.state === this.Characteristic.LockTargetState.SECURED ? LockState.LOCKED : LockState.UNLOCKED);
|
|
52
|
+
}
|
|
48
53
|
async getState() {
|
|
49
54
|
return this.state;
|
|
50
55
|
}
|
|
@@ -78,8 +83,9 @@ export class LockAccessory extends DummyAccessory {
|
|
|
78
83
|
this.sensor.active = false;
|
|
79
84
|
}
|
|
80
85
|
}
|
|
86
|
+
await this.registerStateChange();
|
|
81
87
|
}
|
|
82
|
-
async
|
|
88
|
+
async trigger() {
|
|
83
89
|
if (this.state === this.defaultLockState) {
|
|
84
90
|
const opposite = this.state === this.Characteristic.LockTargetState.SECURED ?
|
|
85
91
|
this.Characteristic.LockTargetState.UNSECURED : this.Characteristic.LockTargetState.SECURED;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock.js","sourceRoot":"","sources":["../../src/accessory/lock.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"lock.js","sourceRoot":"","sources":["../../src/accessory/lock.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,23 @@
|
|
|
1
|
-
import { CharacteristicValue
|
|
1
|
+
import { CharacteristicValue } from 'homebridge';
|
|
2
2
|
import { OnOffAccessory } from './onoff.js';
|
|
3
|
+
import { DummyAccessoryDependency } from '../base.js';
|
|
3
4
|
import { AccessoryType } from '../../model/enums.js';
|
|
4
|
-
import {
|
|
5
|
+
import { LightbulbConfig } from '../../model/types.js';
|
|
5
6
|
import { Webhook } from '../../model/webhook.js';
|
|
6
|
-
import { Log } from '../../tools/log.js';
|
|
7
7
|
export declare class LightbulbAccessory extends OnOffAccessory<LightbulbConfig> {
|
|
8
8
|
private brightness;
|
|
9
|
-
|
|
9
|
+
private fader;
|
|
10
|
+
constructor(dependency: DummyAccessoryDependency<LightbulbConfig>);
|
|
10
11
|
private get isDimmer();
|
|
11
12
|
private get defaultBrightnessStorageKey();
|
|
12
13
|
getAccessoryType(): AccessoryType;
|
|
13
14
|
webhooks(): Webhook[];
|
|
14
15
|
private initializeBrightness_Deprecated;
|
|
15
16
|
logMessageForOnState(value: CharacteristicValue): string;
|
|
17
|
+
setOn(value: CharacteristicValue): Promise<void>;
|
|
16
18
|
private getBrightness;
|
|
17
19
|
private setBrightness;
|
|
20
|
+
onTimerStarted(delay: number): void;
|
|
21
|
+
cancelTimer(): void;
|
|
22
|
+
teardown(): void;
|
|
18
23
|
}
|
|
@@ -2,15 +2,17 @@ import { OnOffAccessory } from './onoff.js';
|
|
|
2
2
|
import { strings } from '../../i18n/i18n.js';
|
|
3
3
|
import { AccessoryType, WebhookCommand } from '../../model/enums.js';
|
|
4
4
|
import { Webhook } from '../../model/webhook.js';
|
|
5
|
+
import { Fader } from '../../timeout/fader.js';
|
|
5
6
|
import { storageGet_Deprecated, Storage } from '../../tools/storage.js';
|
|
6
7
|
const NO_BRIGHTNESS = -1;
|
|
7
8
|
export class LightbulbAccessory extends OnOffAccessory {
|
|
8
9
|
brightness;
|
|
9
|
-
|
|
10
|
-
|
|
10
|
+
fader = new Fader();
|
|
11
|
+
constructor(dependency) {
|
|
12
|
+
super(dependency);
|
|
11
13
|
this.brightness = this.config.defaultBrightness ?? NO_BRIGHTNESS;
|
|
12
14
|
if (this.isDimmer) {
|
|
13
|
-
this.accessoryService.getCharacteristic(
|
|
15
|
+
this.accessoryService.getCharacteristic(dependency.Characteristic.Brightness)
|
|
14
16
|
.onGet(this.getBrightness.bind(this))
|
|
15
17
|
.onSet(this.setBrightness.bind(this));
|
|
16
18
|
if (this.isStateful && Storage.has(this.defaultBrightnessStorageKey)) {
|
|
@@ -58,19 +60,44 @@ export class LightbulbAccessory extends OnOffAccessory {
|
|
|
58
60
|
return super.logMessageForOnState(value);
|
|
59
61
|
}
|
|
60
62
|
}
|
|
63
|
+
async setOn(value) {
|
|
64
|
+
super.setOn(value);
|
|
65
|
+
if (!value) {
|
|
66
|
+
this.accessoryService.updateCharacteristic(this.Characteristic.Brightness, this.brightness);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
61
69
|
async getBrightness() {
|
|
62
|
-
return this.brightness;
|
|
70
|
+
return this.fader.value ?? this.brightness;
|
|
63
71
|
}
|
|
64
72
|
async setBrightness(value) {
|
|
65
73
|
if (this.brightness === value) {
|
|
66
74
|
return;
|
|
67
75
|
}
|
|
68
76
|
this.brightness = value;
|
|
77
|
+
if (this.fader.isFading) {
|
|
78
|
+
this.startTimer();
|
|
79
|
+
}
|
|
69
80
|
this.logIfDesired(strings.lightbulb.brightness, this.brightness.toString());
|
|
70
81
|
if (this.isStateful) {
|
|
71
82
|
await Storage.set(this.defaultBrightnessStorageKey, this.brightness);
|
|
72
83
|
}
|
|
73
84
|
this.accessoryService.updateCharacteristic(this.Characteristic.Brightness, this.brightness);
|
|
74
85
|
}
|
|
86
|
+
onTimerStarted(delay) {
|
|
87
|
+
if (this.config.fadeOut !== true) {
|
|
88
|
+
return;
|
|
89
|
+
}
|
|
90
|
+
this.fader.start(Number(this.brightness), delay, (value) => {
|
|
91
|
+
this.accessoryService.updateCharacteristic(this.Characteristic.Brightness, value);
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
cancelTimer() {
|
|
95
|
+
this.fader.cancel();
|
|
96
|
+
super.cancelTimer();
|
|
97
|
+
}
|
|
98
|
+
teardown() {
|
|
99
|
+
this.fader.teardown();
|
|
100
|
+
super.teardown();
|
|
101
|
+
}
|
|
75
102
|
}
|
|
76
103
|
//# sourceMappingURL=lightbulb.js.map
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"lightbulb.js","sourceRoot":"","sources":["../../../src/accessory/onoff/lightbulb.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
import { CharacteristicValue
|
|
2
|
-
import { DummyAccessory } from '../base.js';
|
|
3
|
-
import {
|
|
1
|
+
import { CharacteristicValue } from 'homebridge';
|
|
2
|
+
import { DummyAccessory, DummyAccessoryDependency } from '../base.js';
|
|
3
|
+
import { OnOffConfig } from '../../model/types.js';
|
|
4
4
|
import { Webhook } from '../../model/webhook.js';
|
|
5
|
-
import { Log } from '../../tools/log.js';
|
|
6
5
|
export declare abstract class OnOffAccessory<C extends OnOffConfig = OnOffConfig> extends DummyAccessory<C> {
|
|
7
6
|
private on;
|
|
8
|
-
constructor(
|
|
7
|
+
constructor(dependency: DummyAccessoryDependency<C>);
|
|
9
8
|
webhooks(): Webhook[];
|
|
10
9
|
private initializeOn;
|
|
11
|
-
private get
|
|
10
|
+
private get defaultState();
|
|
11
|
+
private registerStateChange;
|
|
12
12
|
private getOn;
|
|
13
|
-
|
|
14
|
-
|
|
13
|
+
protected setOn(value: CharacteristicValue): Promise<void>;
|
|
14
|
+
trigger(): Promise<void>;
|
|
15
15
|
reset(): Promise<void>;
|
|
16
16
|
protected logMessageForOnState(value: CharacteristicValue): string;
|
|
17
17
|
}
|
|
@@ -2,13 +2,16 @@ import { DummyAccessory } from '../base.js';
|
|
|
2
2
|
import { strings } from '../../i18n/i18n.js';
|
|
3
3
|
import { Webhook } from '../../model/webhook.js';
|
|
4
4
|
import { storageGet_Deprecated, Storage } from '../../tools/storage.js';
|
|
5
|
-
import { WebhookCommand } from '../../model/enums.js';
|
|
5
|
+
import { isValidOnState, OnState, printableValues, WebhookCommand } from '../../model/enums.js';
|
|
6
6
|
export class OnOffAccessory extends DummyAccessory {
|
|
7
7
|
on;
|
|
8
|
-
constructor(
|
|
9
|
-
super(
|
|
10
|
-
this.
|
|
11
|
-
|
|
8
|
+
constructor(dependency) {
|
|
9
|
+
super(dependency);
|
|
10
|
+
if (!isValidOnState(this.config.defaultState)) {
|
|
11
|
+
this.log.warning(strings.onOff.badDefault, this.name, `'${dependency.config.defaultState}'`, printableValues(OnState));
|
|
12
|
+
}
|
|
13
|
+
this.on = this.defaultState;
|
|
14
|
+
this.accessoryService.getCharacteristic(dependency.Characteristic.On)
|
|
12
15
|
.onGet(this.getOn.bind(this))
|
|
13
16
|
.onSet(this.setOn.bind(this));
|
|
14
17
|
this.initializeOn();
|
|
@@ -24,17 +27,25 @@ export class OnOffAccessory extends DummyAccessory {
|
|
|
24
27
|
async initializeOn() {
|
|
25
28
|
if (!this.isStateful) {
|
|
26
29
|
this.accessoryService.updateCharacteristic(this.Characteristic.On, this.on);
|
|
30
|
+
await this.registerStateChange();
|
|
27
31
|
return;
|
|
28
32
|
}
|
|
29
33
|
const on = await storageGet_Deprecated(this.defaultStateStorageKey);
|
|
30
34
|
if (on === undefined) {
|
|
35
|
+
await this.registerStateChange();
|
|
31
36
|
return;
|
|
32
37
|
}
|
|
33
38
|
await this.setOn(on);
|
|
34
39
|
}
|
|
35
|
-
get
|
|
40
|
+
get defaultState() {
|
|
41
|
+
if (this.config.defaultState) {
|
|
42
|
+
return this.config.defaultState === OnState.ON ? true : false;
|
|
43
|
+
}
|
|
36
44
|
return this.config.defaultOn ? true : false;
|
|
37
45
|
}
|
|
46
|
+
async registerStateChange() {
|
|
47
|
+
await this.onStateChange(this.on ? OnState.ON : OnState.OFF);
|
|
48
|
+
}
|
|
38
49
|
async getOn() {
|
|
39
50
|
return this.on;
|
|
40
51
|
}
|
|
@@ -52,7 +63,7 @@ export class OnOffAccessory extends DummyAccessory {
|
|
|
52
63
|
if (this.isStateful) {
|
|
53
64
|
await Storage.set(this.defaultStateStorageKey, this.on);
|
|
54
65
|
}
|
|
55
|
-
if (this.on !== this.
|
|
66
|
+
if (this.on !== this.defaultState) {
|
|
56
67
|
this.startTimer();
|
|
57
68
|
}
|
|
58
69
|
else {
|
|
@@ -61,21 +72,22 @@ export class OnOffAccessory extends DummyAccessory {
|
|
|
61
72
|
this.accessoryService.updateCharacteristic(this.Characteristic.On, this.on);
|
|
62
73
|
if (this.sensor) {
|
|
63
74
|
if (!this.sensor.timerControlled) {
|
|
64
|
-
this.sensor.active = this.on !== this.
|
|
75
|
+
this.sensor.active = this.on !== this.defaultState;
|
|
65
76
|
}
|
|
66
|
-
else if (this.on !== this.
|
|
77
|
+
else if (this.on !== this.defaultState) {
|
|
67
78
|
this.sensor.active = false;
|
|
68
79
|
}
|
|
69
80
|
}
|
|
81
|
+
await this.registerStateChange();
|
|
70
82
|
}
|
|
71
|
-
async
|
|
72
|
-
if (this.on === this.
|
|
83
|
+
async trigger() {
|
|
84
|
+
if (this.on === this.defaultState) {
|
|
73
85
|
await this.setOn(!this.on);
|
|
74
86
|
}
|
|
75
87
|
}
|
|
76
88
|
async reset() {
|
|
77
|
-
if (this.on !== this.
|
|
78
|
-
await this.setOn(this.
|
|
89
|
+
if (this.on !== this.defaultState) {
|
|
90
|
+
await this.setOn(this.defaultState);
|
|
79
91
|
if (this.sensor?.timerControlled) {
|
|
80
92
|
this.sensor.active = true;
|
|
81
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onoff.js","sourceRoot":"","sources":["../../../src/accessory/onoff/onoff.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"onoff.js","sourceRoot":"","sources":["../../../src/accessory/onoff/onoff.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import { PlatformAccessory } from 'homebridge';
|
|
2
1
|
import { PositionAccessory } from './position.js';
|
|
2
|
+
import { DummyAccessoryDependency } from '../base.js';
|
|
3
3
|
import { AccessoryType, WebhookCommand } from '../../model/enums.js';
|
|
4
|
-
import {
|
|
5
|
-
import { Log } from '../../tools/log.js';
|
|
4
|
+
import { GarageDoorConfig } from '../../model/types.js';
|
|
6
5
|
export declare class GarageDoorAccessory extends PositionAccessory<GarageDoorConfig> {
|
|
7
|
-
constructor(
|
|
6
|
+
constructor(dependency: DummyAccessoryDependency<GarageDoorConfig>);
|
|
8
7
|
getAccessoryType(): AccessoryType;
|
|
9
8
|
get hasPositionState(): boolean;
|
|
10
9
|
get positionClosed(): number;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { PositionAccessory } from './position.js';
|
|
2
2
|
import { AccessoryType, WebhookCommand } from '../../model/enums.js';
|
|
3
3
|
export class GarageDoorAccessory extends PositionAccessory {
|
|
4
|
-
constructor(
|
|
5
|
-
super(
|
|
6
|
-
this.accessoryService.getCharacteristic(Characteristic.ObstructionDetected)
|
|
4
|
+
constructor(dependency) {
|
|
5
|
+
super(dependency);
|
|
6
|
+
this.accessoryService.getCharacteristic(dependency.Characteristic.ObstructionDetected)
|
|
7
7
|
.onGet(async () => false);
|
|
8
8
|
}
|
|
9
9
|
getAccessoryType() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"garage.js","sourceRoot":"","sources":["../../../src/accessory/position/garage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"garage.js","sourceRoot":"","sources":["../../../src/accessory/position/garage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAIlD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGrE,MAAM,OAAO,mBAAoB,SAAQ,iBAAmC;IAE1E,YAAY,UAAsD;QAChE,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,UAAU,CAAC,cAAc,CAAC,mBAAmB,CAAC;aACnF,KAAK,CAAE,KAAK,IAAI,EAAE,CAAC,KAAK,CAAE,CAAC;IAChC,CAAC;IAEQ,gBAAgB;QACvB,OAAO,aAAa,CAAC,gBAAgB,CAAC;IACxC,CAAC;IAED,IAAa,gBAAgB;QAC3B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAa,cAAc;QACzB,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,MAAM,CAAC;IACpD,CAAC;IAED,IAAa,YAAY;QACvB,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,CAAC;IAClD,CAAC;IAED,IAAa,oBAAoB;QAC/B,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC;IAC7C,CAAC;IAED,IAAa,qBAAqB;QAChC,OAAO,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC;IAC9C,CAAC;IAED,IAAa,cAAc;QACzB,OAAO,cAAc,CAAC,eAAe,CAAC;IACxC,CAAC;CACF"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
|
-
import { CharacteristicValue
|
|
2
|
-
import { DummyAccessory } from '../base.js';
|
|
1
|
+
import { CharacteristicValue } from 'homebridge';
|
|
2
|
+
import { DummyAccessory, DummyAccessoryDependency } from '../base.js';
|
|
3
3
|
import { WebhookCommand } from '../../model/enums.js';
|
|
4
|
-
import {
|
|
4
|
+
import { PositionConfig } from '../../model/types.js';
|
|
5
5
|
import { Webhook } from '../../model/webhook.js';
|
|
6
|
-
import { Log } from '../../tools/log.js';
|
|
7
6
|
export declare abstract class PositionAccessory<C extends PositionConfig = PositionConfig> extends DummyAccessory<PositionConfig> {
|
|
8
7
|
private position;
|
|
9
|
-
constructor(
|
|
8
|
+
constructor(dependency: DummyAccessoryDependency<C>);
|
|
10
9
|
protected get hasPositionState(): boolean;
|
|
11
10
|
protected get positionClosed(): number;
|
|
12
11
|
protected get positionOpen(): number;
|
|
@@ -17,9 +16,10 @@ export declare abstract class PositionAccessory<C extends PositionConfig = Posit
|
|
|
17
16
|
private initializePosition;
|
|
18
17
|
private get defaultPosition();
|
|
19
18
|
private getState;
|
|
19
|
+
private registerStateChange;
|
|
20
20
|
private getPosition;
|
|
21
21
|
private setPosition;
|
|
22
|
-
|
|
22
|
+
trigger(): Promise<void>;
|
|
23
23
|
reset(): Promise<void>;
|
|
24
24
|
private logTemplateForCV;
|
|
25
25
|
protected logPosition(value: CharacteristicValue): void;
|