homebridge-virtual-accessories 3.2.5 → 3.3.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/README.md +37 -6
- package/config.schema.json +0 -8
- package/dist/accessories/virtualAccessoryLightbulb.d.ts +1 -2
- package/dist/accessories/virtualAccessoryLightbulb.js +38 -43
- package/dist/accessories/virtualAccessoryLightbulb.js.map +1 -1
- package/dist/accessories/virtualAccessoryLock.d.ts +1 -1
- package/dist/accessories/virtualAccessoryLock.js +9 -2
- package/dist/accessories/virtualAccessoryLock.js.map +1 -1
- package/dist/accessories/virtualAccessorySwitch.d.ts +0 -11
- package/dist/accessories/virtualAccessorySwitch.js +0 -68
- package/dist/accessories/virtualAccessorySwitch.js.map +1 -1
- package/dist/accessoryFactory.d.ts +0 -2
- package/dist/accessoryFactory.js +0 -4
- package/dist/accessoryFactory.js.map +1 -1
- package/dist/configuration/configurationTimer.d.ts +0 -1
- package/dist/configuration/configurationTimer.js +1 -7
- package/dist/configuration/configurationTimer.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
@@ -22,6 +22,11 @@
|
|
22
22
|
|
23
23
|
## <!-- Thin separator line -->
|
24
24
|
|
25
|
+
> [!CAUTION]
|
26
|
+
> Version 3.3.1 breaks the Lock accessory. You will have to delete existing Lock accessories and recreate them.
|
27
|
+
|
28
|
+
## <!-- Thin separator line -->
|
29
|
+
|
25
30
|
<details>
|
26
31
|
<summary>
|
27
32
|
|
@@ -110,7 +115,7 @@ Currently, these are the implemented virtual accessories:
|
|
110
115
|
<span align="right">
|
111
116
|
<h6>
|
112
117
|
|
113
|
-
[Back to top](
|
118
|
+
[Back to top](#top)
|
114
119
|
|
115
120
|
</h6>
|
116
121
|
</span>
|
@@ -168,7 +173,7 @@ The [Synology DSM 7.2.2 Developer Guide](https://help.synology.com/developer-gui
|
|
168
173
|
<span align="right">
|
169
174
|
<h6>
|
170
175
|
|
171
|
-
[Back to top](
|
176
|
+
[Back to top](#top)
|
172
177
|
|
173
178
|
</h6>
|
174
179
|
</span>
|
@@ -199,7 +204,7 @@ It is recommended to use the Homebridge UI to configure this plugin, as the requ
|
|
199
204
|
<span align="right">
|
200
205
|
<h6>
|
201
206
|
|
202
|
-
[Back to top](
|
207
|
+
[Back to top](#top)
|
203
208
|
|
204
209
|
</h6>
|
205
210
|
</span>
|
@@ -692,7 +697,7 @@ To add the speaker accessory in the Home app follow these steps:
|
|
692
697
|
<span align="right">
|
693
698
|
<h6>
|
694
699
|
|
695
|
-
[Back to top](
|
700
|
+
[Back to top](#top)
|
696
701
|
|
697
702
|
</h6>
|
698
703
|
</span>
|
@@ -776,7 +781,7 @@ The raw json payload will contain the accessory id of the heater/cooler and the
|
|
776
781
|
<span align="right">
|
777
782
|
<h6>
|
778
783
|
|
779
|
-
[Back to top](
|
784
|
+
[Back to top](#top)
|
780
785
|
|
781
786
|
</h6>
|
782
787
|
</span>
|
@@ -797,6 +802,14 @@ So here are creative ways people have used this plugin. Maybe they might inspire
|
|
797
802
|
</a>
|
798
803
|
</figure>
|
799
804
|
|
805
|
+
<span align="right">
|
806
|
+
<h6>
|
807
|
+
|
808
|
+
[Back to top](#top)
|
809
|
+
|
810
|
+
</h6>
|
811
|
+
</span>
|
812
|
+
|
800
813
|
## Mentions
|
801
814
|
|
802
815
|
People using Virtual Accessories For Homebridge!
|
@@ -812,6 +825,14 @@ You can catch a glimpse in the [Introduction to Automations in Apple Home](https
|
|
812
825
|
|
813
826
|
He again uses Virtual Accessories for Homebridge in his latest video, [Dummies for Dummies Who Use the HomePod](https://www.youtube.com/watch?v=US5NCnXidYI).
|
814
827
|
|
828
|
+
<span align="right">
|
829
|
+
<h6>
|
830
|
+
|
831
|
+
[Back to top](#top)
|
832
|
+
|
833
|
+
</h6>
|
834
|
+
</span>
|
835
|
+
|
815
836
|
## Known Issues
|
816
837
|
|
817
838
|
#### Issues with Homebridge UI:
|
@@ -823,6 +844,8 @@ He again uses Virtual Accessories for Homebridge in his latest video, [Dummies f
|
|
823
844
|
|
824
845
|
- The ability to order the accessories in the config popup has been rolled back, as it makes it impossible to drag a number slider, for example to set timer values. A bug report has been opened with the underlying framework project and, once this behavior is fixed, this functionality will be restored. The temporary workaround is to manually edit the order of the accessories in the JSON configuration.
|
825
846
|
|
847
|
+
**This issue has been fixed in the underlying framework and ability to order the accessories in the config popup will be available in an upcoming release.**
|
848
|
+
|
826
849
|
#### Issues with HomeKit:
|
827
850
|
|
828
851
|
- The volume on the Doorbell accessory does not work. This is a limitation of Homekit. Per the [HomeKit Accessory Protocol specification](https://forum.iobroker.net/assets/uploads/files/1634848447889-apple-spezifikation-homekit.pdf), the Doorbell is `the primary service of the Video Doorbell Profile.` What that means is that a Doorbell should only be added to HomeKit as part of a Video Doorbell and the Home app will not display a standalone Doorbell. This plugin takes advantage of the fact that, although it is not displayed, the Doorbell is still there and the companion switch allows you to interact with it, leading HomeKit to play a chime on the HomePods. Unfortunately, because the Doorbell is not displayed, you cannot configure which HomePod(s) it connects to and you cannot configure the volume. You can set the volume level in the free [Eve app](https://www.evehome.com/en-us/eve-app), however it will not affect the HomePod volume.
|
@@ -837,6 +860,14 @@ He again uses Virtual Accessories for Homebridge in his latest video, [Dummies f
|
|
837
860
|
>
|
838
861
|
> I have not done this myself, so please refer to the plugin documentation for any questions.
|
839
862
|
|
863
|
+
<span align="right">
|
864
|
+
<h6>
|
865
|
+
|
866
|
+
[Back to top](#top)
|
867
|
+
|
868
|
+
</h6>
|
869
|
+
</span>
|
870
|
+
|
840
871
|
## What if I run into a problem?
|
841
872
|
|
842
873
|
Check the [Wiki](https://github.com/justjam2013/homebridge-virtual-accessories/wiki). Here you will find entries with instructions in the event of breaking updates. I will also post detailed instructions for using certain functionalities, like the webhook service.
|
@@ -848,7 +879,7 @@ Please open a [Feature Request issue](https://github.com/justjam2013/homebridge-
|
|
848
879
|
<span align="right">
|
849
880
|
<h6>
|
850
881
|
|
851
|
-
[Back to top](
|
882
|
+
[Back to top](#top)
|
852
883
|
|
853
884
|
</h6>
|
854
885
|
</span>
|
package/config.schema.json
CHANGED
@@ -699,14 +699,6 @@
|
|
699
699
|
"functionBody": "return model.devices[arrayIndices].resetTimer && model.devices[arrayIndices].resetTimer.durationIsRandom === true;"
|
700
700
|
}
|
701
701
|
},
|
702
|
-
"isDynamic": {
|
703
|
-
"title": "Timer is Dynamic",
|
704
|
-
"description": "The timer duration can be changed in the UI",
|
705
|
-
"type": "boolean",
|
706
|
-
"condition": {
|
707
|
-
"functionBody": "return false;"
|
708
|
-
}
|
709
|
-
},
|
710
702
|
"isResettable": {
|
711
703
|
"title": "Timer is Resettable",
|
712
704
|
"description": "The timer is reset every time the accessory is triggered, even if the state of the accessory does not change",
|
@@ -15,9 +15,8 @@ export declare class Lightbulb extends Accessory {
|
|
15
15
|
private readonly brightnessStorageKey;
|
16
16
|
private readonly colorTemperatureStorageKey;
|
17
17
|
private type;
|
18
|
-
private isCompanionLightbulb;
|
19
18
|
private states;
|
20
|
-
constructor(platform: VirtualAccessoriesPlatform, accessory: PlatformAccessory
|
19
|
+
constructor(platform: VirtualAccessoriesPlatform, accessory: PlatformAccessory);
|
21
20
|
setOn(value: CharacteristicValue): Promise<void>;
|
22
21
|
getOn(): Promise<CharacteristicValue>;
|
23
22
|
setBrightness(value: CharacteristicValue): Promise<void>;
|
@@ -1,3 +1,4 @@
|
|
1
|
+
/* eslint-disable brace-style */
|
1
2
|
import { Accessory } from './virtualAccessory.js';
|
2
3
|
import { Utils } from '../utils.js';
|
3
4
|
/**
|
@@ -15,58 +16,42 @@ export class Lightbulb extends Accessory {
|
|
15
16
|
brightnessStorageKey = 'LightbulbBrightness';
|
16
17
|
colorTemperatureStorageKey = 'LightbulbColorTemperature';
|
17
18
|
type = Lightbulb.WHITE;
|
18
|
-
isCompanionLightbulb = false;
|
19
19
|
states = {
|
20
20
|
LightbulbState: Lightbulb.OFF,
|
21
21
|
LightbulbBrightness: 0,
|
22
22
|
LightbulbColorTemperature: 2700, // Kelvin
|
23
23
|
// TODO: Add Brightness, Hue, Saturation
|
24
24
|
};
|
25
|
-
constructor(platform, accessory
|
25
|
+
constructor(platform, accessory) {
|
26
26
|
super(platform, accessory);
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
27
|
+
this.type = this.accessoryConfiguration.lightbulb.type;
|
28
|
+
// First configure the device based on the accessory details
|
29
|
+
this.defaultState = this.accessoryConfiguration.lightbulb.defaultState === 'on' ? Lightbulb.ON : Lightbulb.OFF;
|
30
|
+
const brightness = this.accessoryConfiguration.lightbulb.brightness;
|
31
|
+
const colorTemperatureKelvin = this.accessoryConfiguration.lightbulb.colorTemperatureKelvin;
|
32
|
+
this.states.LightbulbState = this.defaultState;
|
33
|
+
this.states.LightbulbBrightness = brightness;
|
34
|
+
if (this.type === Lightbulb.AMBIANCE) {
|
35
|
+
this.states.LightbulbColorTemperature = colorTemperatureKelvin;
|
32
36
|
}
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
const
|
38
|
-
const
|
39
|
-
|
40
|
-
|
41
|
-
if (this.type === Lightbulb.AMBIANCE) {
|
42
|
-
this.states.LightbulbColorTemperature = colorTemperatureKelvin;
|
37
|
+
// If the accessory is stateful retrieve stored state
|
38
|
+
if (this.accessoryConfiguration.accessoryIsStateful) {
|
39
|
+
const accessoryState = this.loadAccessoryState(this.storagePath);
|
40
|
+
const cachedState = accessoryState[this.stateStorageKey];
|
41
|
+
const cachedBrightness = accessoryState[this.brightnessStorageKey];
|
42
|
+
const cachedColorTemperature = accessoryState[this.colorTemperatureStorageKey];
|
43
|
+
if (cachedState !== undefined) {
|
44
|
+
this.states.LightbulbState = cachedState;
|
43
45
|
}
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
const cachedColorTemperature = accessoryState[this.colorTemperatureStorageKey];
|
50
|
-
if (cachedState !== undefined) {
|
51
|
-
this.states.LightbulbState = cachedState;
|
52
|
-
}
|
53
|
-
if (cachedBrightness !== undefined) {
|
54
|
-
this.states.LightbulbBrightness = cachedBrightness;
|
55
|
-
}
|
56
|
-
if (this.type === Lightbulb.AMBIANCE && cachedColorTemperature !== undefined) {
|
57
|
-
this.states.LightbulbColorTemperature = cachedColorTemperature;
|
58
|
-
}
|
46
|
+
if (cachedBrightness !== undefined) {
|
47
|
+
this.states.LightbulbBrightness = cachedBrightness;
|
48
|
+
}
|
49
|
+
if (this.type === Lightbulb.AMBIANCE && cachedColorTemperature !== undefined) {
|
50
|
+
this.states.LightbulbColorTemperature = cachedColorTemperature;
|
59
51
|
}
|
60
52
|
}
|
61
|
-
|
62
|
-
|
63
|
-
this.service.setCharacteristic(this.platform.Characteristic.Name, this.accessoryConfiguration.accessoryName);
|
64
|
-
}
|
65
|
-
else {
|
66
|
-
this.service = this.accessory.getService(companionLightbulbName) ||
|
67
|
-
this.accessory.addService(this.platform.Service.Lightbulb, companionLightbulbName, accessory.UUID + companionLightbulbName);
|
68
|
-
this.service.setCharacteristic(this.platform.Characteristic.Name, companionLightbulbName);
|
69
|
-
}
|
53
|
+
this.service = this.accessory.getService(this.platform.Service.Lightbulb) || this.accessory.addService(this.platform.Service.Lightbulb);
|
54
|
+
this.service.setCharacteristic(this.platform.Characteristic.Name, this.accessoryConfiguration.accessoryName);
|
70
55
|
// Update the initial state of the accessory
|
71
56
|
this.log.debug(`[${this.accessoryName}] Setting Lightbulb Current State: ${Lightbulb.getStateName(this.states.LightbulbState)}`);
|
72
57
|
this.service.updateCharacteristic(this.platform.Characteristic.On, (this.states.LightbulbState));
|
@@ -96,11 +81,16 @@ export class Lightbulb extends Accessory {
|
|
96
81
|
// Handlers
|
97
82
|
async setOn(value) {
|
98
83
|
this.states.LightbulbState = value;
|
99
|
-
|
100
|
-
if (this.states.LightbulbState === Lightbulb.
|
84
|
+
// If brightness is 0% or 100%, ON = 100%, OFF = 0%
|
85
|
+
if ((this.states.LightbulbState === Lightbulb.ON) && (this.states.LightbulbBrightness === 0)) {
|
86
|
+
this.states.LightbulbBrightness = 100;
|
87
|
+
this.service?.updateCharacteristic(this.platform.Characteristic.Brightness, (this.states.LightbulbBrightness));
|
88
|
+
}
|
89
|
+
else if ((this.states.LightbulbState === Lightbulb.OFF) && (this.states.LightbulbBrightness === 100)) {
|
101
90
|
this.states.LightbulbBrightness = 0;
|
102
91
|
this.service?.updateCharacteristic(this.platform.Characteristic.Brightness, (this.states.LightbulbBrightness));
|
103
92
|
}
|
93
|
+
this.storeState();
|
104
94
|
this.log.info(`[${this.accessoryName}] Setting State: ${Lightbulb.getStateName(this.states.LightbulbState)}`);
|
105
95
|
}
|
106
96
|
async getOn() {
|
@@ -110,6 +100,11 @@ export class Lightbulb extends Accessory {
|
|
110
100
|
}
|
111
101
|
async setBrightness(value) {
|
112
102
|
this.states.LightbulbBrightness = value;
|
103
|
+
// Setting the brightness to 0 turns lightbulb OFF
|
104
|
+
if ((this.states.LightbulbBrightness === 0) && (this.states.LightbulbState === Lightbulb.ON)) {
|
105
|
+
this.states.LightbulbState = Lightbulb.OFF;
|
106
|
+
this.service?.updateCharacteristic(this.platform.Characteristic.On, (this.states.LightbulbState));
|
107
|
+
}
|
113
108
|
this.storeState();
|
114
109
|
this.log.info(`[${this.accessoryName}] Setting Brightness: ${this.states.LightbulbBrightness}%`);
|
115
110
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"virtualAccessoryLightbulb.js","sourceRoot":"","sources":["../../src/accessories/virtualAccessoryLightbulb.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"virtualAccessoryLightbulb.js","sourceRoot":"","sources":["../../src/accessories/virtualAccessoryLightbulb.ts"],"names":[],"mappings":"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"}
|
@@ -60,7 +60,7 @@ export class Lock extends Accessory {
|
|
60
60
|
* can use the same subtype id.)
|
61
61
|
*/
|
62
62
|
// Creating Lock Management service
|
63
|
-
const lockManagementServiceName =
|
63
|
+
const lockManagementServiceName = `${this.accessoryConfiguration.accessoryName} Management`;
|
64
64
|
const lockManagementService = this.accessory.getService(lockManagementServiceName)
|
65
65
|
|| this.accessory.addService(this.platform.Service.LockManagement, lockManagementServiceName, this.accessory.UUID + '-LMS');
|
66
66
|
lockManagementService.getCharacteristic(this.platform.Characteristic.LockControlPoint)
|
@@ -69,7 +69,14 @@ export class Lock extends Accessory {
|
|
69
69
|
.onGet(this.getVersion.bind(this));
|
70
70
|
lockManagementService.getCharacteristic(this.platform.Characteristic.LockManagementAutoSecurityTimeout)
|
71
71
|
.onSet(this.setLockManagementAutoSecurityTimeout.bind(this))
|
72
|
-
.onGet(this.getLockManagementAutoSecurityTimeout.bind(this))
|
72
|
+
.onGet(this.getLockManagementAutoSecurityTimeout.bind(this))
|
73
|
+
.setProps({
|
74
|
+
minValue: 0,
|
75
|
+
maxValue: 3600,
|
76
|
+
minStep: 1,
|
77
|
+
unit: "seconds" /* Units.SECONDS */,
|
78
|
+
});
|
79
|
+
;
|
73
80
|
}
|
74
81
|
// Handlers
|
75
82
|
async getLockCurrentState() {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"virtualAccessoryLock.js","sourceRoot":"","sources":["../../src/accessories/virtualAccessoryLock.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"virtualAccessoryLock.js","sourceRoot":"","sources":["../../src/accessories/virtualAccessoryLock.ts"],"names":[],"mappings":"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"}
|
@@ -12,15 +12,7 @@ export declare class Switch extends Accessory {
|
|
12
12
|
private readonly timerStartTimeStorageKey;
|
13
13
|
private readonly timerDurationStorageKey;
|
14
14
|
private readonly timerIsRunningStorageKey;
|
15
|
-
private readonly timerSliderSecondsStorageKey;
|
16
|
-
private readonly timerSliderMinutesStorageKey;
|
17
|
-
private readonly timerSliderHoursStorageKey;
|
18
|
-
private readonly timerSliderDaysStorageKey;
|
19
15
|
private durationTimer?;
|
20
|
-
private timerSecondsSlider?;
|
21
|
-
private timerMinutesSlider?;
|
22
|
-
private timerHoursSlider?;
|
23
|
-
private timerDaysSlider?;
|
24
16
|
private companionSensor?;
|
25
17
|
private isCompanionSwitch;
|
26
18
|
private companionSwitchPostfix;
|
@@ -36,8 +28,5 @@ export declare class Switch extends Accessory {
|
|
36
28
|
static getStateName(state: boolean): string;
|
37
29
|
private setupResetTimer;
|
38
30
|
private setupCompanionSensor;
|
39
|
-
private setupResetTimerSliders;
|
40
|
-
private createSlider;
|
41
|
-
private restoreTimerSliders;
|
42
31
|
private restoreRunningTimer;
|
43
32
|
}
|
@@ -1,7 +1,6 @@
|
|
1
1
|
import { Accessory } from './virtualAccessory.js';
|
2
2
|
import { AccessoryFactory } from '../accessoryFactory.js';
|
3
3
|
import { AccessoryNotAllowedError, NotCompanionError } from '../errors.js';
|
4
|
-
import { DurationConfiguration } from '../configuration/configurationDuration.js';
|
5
4
|
import { Sensor } from '../sensors/virtualSensor.js';
|
6
5
|
import { Timer } from '../timer.js';
|
7
6
|
import { Utils } from '../utils.js';
|
@@ -17,15 +16,7 @@ export class Switch extends Accessory {
|
|
17
16
|
timerStartTimeStorageKey = 'TimerStartTime';
|
18
17
|
timerDurationStorageKey = 'TimerDuration';
|
19
18
|
timerIsRunningStorageKey = 'TimerIsRunning';
|
20
|
-
timerSliderSecondsStorageKey = 'TimerSliderSeconds';
|
21
|
-
timerSliderMinutesStorageKey = 'TimerSliderMinutes';
|
22
|
-
timerSliderHoursStorageKey = 'TimerSliderHours';
|
23
|
-
timerSliderDaysStorageKey = 'TimerSliderDays';
|
24
19
|
durationTimer;
|
25
|
-
timerSecondsSlider;
|
26
|
-
timerMinutesSlider;
|
27
|
-
timerHoursSlider;
|
28
|
-
timerDaysSlider;
|
29
20
|
companionSensor;
|
30
21
|
isCompanionSwitch = false;
|
31
22
|
companionSwitchPostfix = '-switch';
|
@@ -58,9 +49,6 @@ export class Switch extends Accessory {
|
|
58
49
|
}
|
59
50
|
if (this.accessoryConfiguration.switch.hasResetTimer) {
|
60
51
|
this.log.debug(`[${this.accessoryConfiguration.accessoryName}] Switch has reset timer`);
|
61
|
-
if (this.accessoryConfiguration.resetTimer.isDynamic) {
|
62
|
-
this.restoreTimerSliders(accessoryState);
|
63
|
-
}
|
64
52
|
const cachedTimerStartTime = accessoryState[this.timerStartTimeStorageKey];
|
65
53
|
const cachedTimerDuration = accessoryState[this.timerDurationStorageKey];
|
66
54
|
const cachedTimerIsRunning = accessoryState[this.timerIsRunningStorageKey];
|
@@ -101,9 +89,6 @@ export class Switch extends Accessory {
|
|
101
89
|
* can use the same subtype id.)
|
102
90
|
*/
|
103
91
|
if (!this.isCompanionSwitch) {
|
104
|
-
if (this.accessoryConfiguration.switch.hasResetTimer && this.accessoryConfiguration.resetTimer.isDynamic) {
|
105
|
-
this.setupResetTimerSliders();
|
106
|
-
}
|
107
92
|
// Create sensor service
|
108
93
|
if (this.accessoryConfiguration.switch.hasCompanionSensor) {
|
109
94
|
this.setupCompanionSensor();
|
@@ -157,12 +142,6 @@ export class Switch extends Accessory {
|
|
157
142
|
Object.assign(jsonState, { [this.timerStartTimeStorageKey]: timerStartTime });
|
158
143
|
Object.assign(jsonState, { [this.timerDurationStorageKey]: timerDuration });
|
159
144
|
Object.assign(jsonState, { [this.timerIsRunningStorageKey]: timerIsRunning });
|
160
|
-
if (this.accessoryConfiguration.resetTimer.isDynamic) {
|
161
|
-
Object.assign(jsonState, { [this.timerSliderSecondsStorageKey]: this.timerSecondsSlider?.getBrightness() });
|
162
|
-
Object.assign(jsonState, { [this.timerSliderMinutesStorageKey]: this.timerMinutesSlider?.getBrightness() });
|
163
|
-
Object.assign(jsonState, { [this.timerSliderHoursStorageKey]: this.timerHoursSlider?.getBrightness() });
|
164
|
-
Object.assign(jsonState, { [this.timerSliderDaysStorageKey]: this.timerDaysSlider?.getBrightness() });
|
165
|
-
}
|
166
145
|
}
|
167
146
|
const json = JSON.stringify(jsonState);
|
168
147
|
return json;
|
@@ -218,53 +197,6 @@ export class Switch extends Accessory {
|
|
218
197
|
this.companionSensor = AccessoryFactory.createVirtualCompanionSensor(this.platform, this.accessory, this.accessoryConfiguration.companionSensor.type, this.accessoryConfiguration.companionSensor.name);
|
219
198
|
this.companionSensor.triggerCompanionSensorState(this.states.SensorState, this, this.accessoryConfiguration.switch.muteLogging);
|
220
199
|
}
|
221
|
-
setupResetTimerSliders() {
|
222
|
-
// Order days, hours, minutes, seconds
|
223
|
-
this.timerDaysSlider = this.createSlider('Days', DurationConfiguration.DAYS_MAX_VALUE, this.accessoryConfiguration.resetTimer.duration.days);
|
224
|
-
this.timerHoursSlider = this.createSlider('Hours', DurationConfiguration.HOURS_MAX_VALUE, this.accessoryConfiguration.resetTimer.duration.hours);
|
225
|
-
this.timerMinutesSlider = this.createSlider('Minutes', DurationConfiguration.MINUTES_MAX_VALUE, this.accessoryConfiguration.resetTimer.duration.minutes);
|
226
|
-
this.timerSecondsSlider = this.createSlider('Seconds', DurationConfiguration.SECONDS_MAX_VALUE, this.accessoryConfiguration.resetTimer.duration.seconds);
|
227
|
-
}
|
228
|
-
createSlider(companionName, maximumValue, value) {
|
229
|
-
const slider = AccessoryFactory.createVirtualCompanionLightbulb(this.platform, this.accessory, this.accessoryConfiguration.accessoryName + ' ' + companionName, value);
|
230
|
-
slider?.service?.getCharacteristic(this.platform.Characteristic.Brightness)
|
231
|
-
.setProps({
|
232
|
-
minValue: 0,
|
233
|
-
maxValue: maximumValue,
|
234
|
-
minStep: 1,
|
235
|
-
unit: null,
|
236
|
-
})
|
237
|
-
.onSet(Utils.debounce(async (value) => {
|
238
|
-
const maxValue = slider.service?.getCharacteristic(this.platform.Characteristic.Brightness).props.maxValue;
|
239
|
-
const brightness = (maxValue !== undefined && value > maxValue) ? maxValue : value;
|
240
|
-
// call original handler
|
241
|
-
slider.setBrightness(brightness);
|
242
|
-
this.storeState();
|
243
|
-
// recalculate duration
|
244
|
-
const duration = new DurationConfiguration();
|
245
|
-
duration.seconds = (await this.timerSecondsSlider?.getBrightness());
|
246
|
-
duration.minutes = (await this.timerMinutesSlider?.getBrightness());
|
247
|
-
duration.hours = (await this.timerHoursSlider?.getBrightness());
|
248
|
-
duration.days = (await this.timerDaysSlider?.getBrightness());
|
249
|
-
this.durationTimer?.setDefaultDuration(this.convertDurationToSeconds(duration));
|
250
|
-
}));
|
251
|
-
return slider;
|
252
|
-
}
|
253
|
-
restoreTimerSliders(accessoryState) {
|
254
|
-
const cachedTimerSliderSeconds = accessoryState[this.timerSliderSecondsStorageKey];
|
255
|
-
const cachedTimerSliderMinutes = accessoryState[this.timerSliderMinutesStorageKey];
|
256
|
-
const cachedTimerSliderHours = accessoryState[this.timerSliderHoursStorageKey];
|
257
|
-
const cachedTimerSliderDays = accessoryState[this.timerSliderDaysStorageKey];
|
258
|
-
// Order days, hours, minutes, seconds
|
259
|
-
this.log.debug(`[${this.accessoryConfiguration.accessoryName}] Cached Timer Slider Days: ${cachedTimerSliderDays}`);
|
260
|
-
this.log.debug(`[${this.accessoryConfiguration.accessoryName}] Cached Timer Slider Hours: ${cachedTimerSliderHours}`);
|
261
|
-
this.log.debug(`[${this.accessoryConfiguration.accessoryName}] Cached Timer Slider Minutes: ${cachedTimerSliderMinutes}`);
|
262
|
-
this.log.debug(`[${this.accessoryConfiguration.accessoryName}] Cached Timer Slider Seconds: ${cachedTimerSliderSeconds}`);
|
263
|
-
this.timerSecondsSlider?.setBrightness(cachedTimerSliderSeconds);
|
264
|
-
this.timerMinutesSlider?.setBrightness(cachedTimerSliderMinutes);
|
265
|
-
this.timerHoursSlider?.setBrightness(cachedTimerSliderHours);
|
266
|
-
this.timerDaysSlider?.setBrightness(cachedTimerSliderDays);
|
267
|
-
}
|
268
200
|
restoreRunningTimer(cachedTimerStartTime, cachedTimerDuration) {
|
269
201
|
// eslint-disable-next-line max-len
|
270
202
|
const elapsedTimeSinceTimerStart = Math.trunc(Duration.between(Utils.zonedDateTime(cachedTimerStartTime), Utils.now()).toMillis() / 1000); // seconds
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"virtualAccessorySwitch.js","sourceRoot":"","sources":["../../src/accessories/virtualAccessorySwitch.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"virtualAccessorySwitch.js","sourceRoot":"","sources":["../../src/accessories/virtualAccessorySwitch.ts"],"names":[],"mappings":"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"}
|
@@ -1,7 +1,6 @@
|
|
1
1
|
import type { PlatformAccessory } from 'homebridge';
|
2
2
|
import { VirtualAccessoriesPlatform } from './platform.js';
|
3
3
|
import { Accessory } from './accessories/virtualAccessory.js';
|
4
|
-
import { Lightbulb } from './accessories/virtualAccessoryLightbulb.js';
|
5
4
|
import { Switch } from './accessories/virtualAccessorySwitch.js';
|
6
5
|
import { Sensor } from './sensors/virtualSensor.js';
|
7
6
|
import { Trigger } from './triggers/trigger.js';
|
@@ -13,7 +12,6 @@ export declare abstract class AccessoryFactory {
|
|
13
12
|
constructor();
|
14
13
|
static createVirtualAccessory(platform: VirtualAccessoriesPlatform, accessory: PlatformAccessory, accessoryType: string): Accessory | undefined;
|
15
14
|
static createVirtualCompanionSwitch(platform: VirtualAccessoriesPlatform, accessory: PlatformAccessory, companionSwitchName: string): Switch | undefined;
|
16
|
-
static createVirtualCompanionLightbulb(platform: VirtualAccessoriesPlatform, accessory: PlatformAccessory, companionLightbulbName: string, companionLightbulbBrightness: number): Lightbulb | undefined;
|
17
15
|
static createVirtualCompanionSensor(platform: VirtualAccessoriesPlatform, accessory: PlatformAccessory, sensorType: string, companionSensorName: string): Sensor | undefined;
|
18
16
|
static createVirtualSensor(platform: VirtualAccessoriesPlatform, accessory: PlatformAccessory, sensorType: string): Sensor | undefined;
|
19
17
|
private static createSensor;
|
package/dist/accessoryFactory.js
CHANGED
@@ -80,10 +80,6 @@ export class AccessoryFactory {
|
|
80
80
|
const virtualAccessory = new Switch(platform, accessory, companionSwitchName);
|
81
81
|
return virtualAccessory;
|
82
82
|
}
|
83
|
-
static createVirtualCompanionLightbulb(platform, accessory, companionLightbulbName, companionLightbulbBrightness) {
|
84
|
-
const virtualAccessory = new Lightbulb(platform, accessory, companionLightbulbName, companionLightbulbBrightness);
|
85
|
-
return virtualAccessory;
|
86
|
-
}
|
87
83
|
static createVirtualCompanionSensor(platform, accessory, sensorType, companionSensorName) {
|
88
84
|
const companionSensor = AccessoryFactory.createSensor(platform, accessory, sensorType, companionSensorName);
|
89
85
|
return companionSensor;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"accessoryFactory.js","sourceRoot":"","sources":["../src/accessoryFactory.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"accessoryFactory.js","sourceRoot":"","sources":["../src/accessoryFactory.ts"],"names":[],"mappings":"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"}
|
@@ -1,4 +1,3 @@
|
|
1
|
-
/* eslint-disable curly */
|
2
1
|
/* eslint-disable brace-style */
|
3
2
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
4
3
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
@@ -21,7 +20,6 @@ export class TimerConfiguration {
|
|
21
20
|
durationRandomMin;
|
22
21
|
durationRandomMax;
|
23
22
|
isResettable = false;
|
24
|
-
isDynamic = false;
|
25
23
|
static prefix = 'resetTimer';
|
26
24
|
errorFields = [];
|
27
25
|
isValid() {
|
@@ -62,7 +60,6 @@ export class TimerConfiguration {
|
|
62
60
|
this.durationRandomMin !== undefined &&
|
63
61
|
this.durationRandomMax !== undefined) ? (this.convertDurationToSeconds(this.durationRandomMin) < this.convertDurationToSeconds(this.durationRandomMax)) :
|
64
62
|
true);
|
65
|
-
const isValidIsDynamic = ((this.durationIsRandom === true && this.isDynamic === true) ? false : true);
|
66
63
|
if (!isValidDuration) {
|
67
64
|
durationErrorFields.forEach((errorField) => {
|
68
65
|
this.errorFields.push(TimerConfiguration.prefix + '.' + errorField);
|
@@ -81,14 +78,11 @@ export class TimerConfiguration {
|
|
81
78
|
if (!isValidDurationRandomRange) {
|
82
79
|
this.errorFields.push(TimerConfiguration.prefix + '.' + durationRandomMinFieldName, TimerConfiguration.prefix + '.' + durationRandomMaxFieldName);
|
83
80
|
}
|
84
|
-
if (!isValidIsDynamic)
|
85
|
-
this.errorFields.push(TimerConfiguration.prefix + '.isDynamic');
|
86
81
|
return [
|
87
82
|
(isValidDuration &&
|
88
83
|
isValidDurationRandomMin &&
|
89
84
|
isValidDurationRandomMax &&
|
90
|
-
isValidDurationRandomRange
|
91
|
-
isValidIsDynamic),
|
85
|
+
isValidDurationRandomRange),
|
92
86
|
this.errorFields,
|
93
87
|
];
|
94
88
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"configurationTimer.js","sourceRoot":"","sources":["../../src/configuration/configurationTimer.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"configurationTimer.js","sourceRoot":"","sources":["../../src/configuration/configurationTimer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
"name": "homebridge-virtual-accessories",
|
3
3
|
"displayName": "Virtual Accessories for Homebridge",
|
4
4
|
"type": "module",
|
5
|
-
"version": "3.
|
5
|
+
"version": "3.3.1",
|
6
6
|
"description": "Virtual HomeKit accessories for Homebridge.",
|
7
7
|
"author": "justjam2013",
|
8
8
|
"license": "MIT",
|