homebridge-dummy 1.2.0-beta.0 → 1.3.0-beta.0
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 +19 -7
- package/README.md +61 -24
- package/config.schema.json +92 -0
- package/dist/accessory/base.d.ts +2 -2
- package/dist/accessory/base.js +9 -3
- package/dist/accessory/base.js.map +1 -1
- package/dist/accessory/group.d.ts +1 -1
- package/dist/accessory/group.js +2 -2
- package/dist/accessory/group.js.map +1 -1
- package/dist/accessory/helpers.d.ts +1 -1
- package/dist/accessory/helpers.js +9 -9
- package/dist/accessory/helpers.js.map +1 -1
- package/dist/accessory/lock.d.ts +1 -1
- package/dist/accessory/lock.js +12 -11
- package/dist/accessory/lock.js.map +1 -1
- package/dist/accessory/onoff/lightbulb.d.ts +1 -1
- package/dist/accessory/onoff/lightbulb.js +4 -4
- package/dist/accessory/onoff/lightbulb.js.map +1 -1
- package/dist/accessory/onoff/onoff.d.ts +1 -1
- package/dist/accessory/onoff/onoff.js +8 -10
- package/dist/accessory/onoff/onoff.js.map +1 -1
- package/dist/accessory/position/position.d.ts +1 -1
- package/dist/accessory/position/position.js +12 -11
- package/dist/accessory/position/position.js.map +1 -1
- package/dist/accessory/sensor.d.ts +0 -1
- package/dist/accessory/sensor.js +6 -4
- package/dist/accessory/sensor.js.map +1 -1
- package/dist/accessory/thermostat.d.ts +1 -1
- package/dist/accessory/thermostat.js +13 -7
- package/dist/accessory/thermostat.js.map +1 -1
- package/dist/homebridge/platform.js +4 -3
- 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/en.d.ts +28 -1
- package/dist/i18n/en.js +28 -1
- package/dist/i18n/en.js.map +1 -1
- package/dist/i18n/i18n.d.ts +28 -1
- package/dist/i18n/template.d.ts +28 -1
- package/dist/i18n/zz.d.ts +28 -1
- package/dist/model/enums.d.ts +17 -2
- package/dist/model/enums.js +30 -2
- package/dist/model/enums.js.map +1 -1
- package/dist/model/types.d.ts +8 -1
- package/dist/model/webhook.js +6 -1
- package/dist/model/webhook.js.map +1 -1
- package/dist/timeout/limiter.d.ts +17 -0
- package/dist/timeout/limiter.js +137 -0
- package/dist/timeout/limiter.js.map +1 -0
- package/dist/timeout/schedule.d.ts +0 -1
- package/dist/timeout/schedule.js +9 -4
- package/dist/timeout/schedule.js.map +1 -1
- package/dist/timeout/timeout.d.ts +6 -2
- package/dist/timeout/timeout.js +62 -58
- package/dist/timeout/timeout.js.map +1 -1
- package/dist/timeout/timer.d.ts +1 -1
- package/dist/timeout/timer.js +12 -4
- package/dist/timeout/timer.js.map +1 -1
- package/dist/tools/storage.d.ts +4 -2
- package/dist/tools/storage.js +5 -6
- package/dist/tools/storage.js.map +1 -1
- package/package.json +4 -8
package/dist/model/webhook.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import escape from 'escape-html';
|
|
2
2
|
import express from 'express';
|
|
3
|
-
import { TemperatureUnits, WebhookCommand } from './enums.js';
|
|
3
|
+
import { isValidTemperatureUnits, printableValues, TemperatureUnits, WebhookCommand } from './enums.js';
|
|
4
4
|
import { assert } from '../tools/validation.js';
|
|
5
5
|
import { strings } from '../i18n/i18n.js';
|
|
6
6
|
import { fromCelsius, toCelsius } from '../tools/temperature.js';
|
|
@@ -108,6 +108,11 @@ export class WebhookManager {
|
|
|
108
108
|
break;
|
|
109
109
|
}
|
|
110
110
|
case WebhookCommand.TargetTemperature: {
|
|
111
|
+
if (!isValidTemperatureUnits(body.units)) {
|
|
112
|
+
validRequest = false;
|
|
113
|
+
requirements = `${strings.webhook.badUnits.replace('%s', `'${command}'`).replace('%s', `'${body.units}'`)} ${printableValues(TemperatureUnits)}`;
|
|
114
|
+
break;
|
|
115
|
+
}
|
|
111
116
|
const units = body.units ?? TemperatureUnits.CELSIUS;
|
|
112
117
|
const minTemp = fromCelsius(MINIMUM_TEMPERATURE, units);
|
|
113
118
|
const maxTemp = fromCelsius(MAXIMUM_TEMPERATURE, units);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../src/model/webhook.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,OAA8B,MAAM,SAAS,CAAC;AAIrD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../src/model/webhook.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { Timeout } from './timeout.js';
|
|
2
|
+
import { LimiterConfig } from '../model/types.js';
|
|
3
|
+
import { Log } from '../tools/log.js';
|
|
4
|
+
export default class Limiter extends Timeout {
|
|
5
|
+
private readonly config;
|
|
6
|
+
static new(config: LimiterConfig, caller: string, log: Log, disableLogging: boolean): Limiter | undefined;
|
|
7
|
+
private limit;
|
|
8
|
+
private startedAtTimestamp?;
|
|
9
|
+
private constructor();
|
|
10
|
+
private get limitStorageKey();
|
|
11
|
+
start(callback: () => Promise<void>): void;
|
|
12
|
+
reset(): void;
|
|
13
|
+
private resetTimeRemaining;
|
|
14
|
+
private resetPeriod;
|
|
15
|
+
private storeLimit;
|
|
16
|
+
private logTimeRemaining;
|
|
17
|
+
}
|
|
@@ -0,0 +1,137 @@
|
|
|
1
|
+
import { DAY, getDelay, HOUR, MINUTE, SECOND, Timeout } from './timeout.js';
|
|
2
|
+
import { strings } from '../i18n/i18n.js';
|
|
3
|
+
import { isValidTimeUnits, printableValues, TimePeriod, TimeUnits } from '../model/enums.js';
|
|
4
|
+
import { STORAGE_KEY_SUFFIX_LIMIT, storageGet, storageSet } from '../tools/storage.js';
|
|
5
|
+
import { assert } from '../tools/validation.js';
|
|
6
|
+
export default class Limiter extends Timeout {
|
|
7
|
+
config;
|
|
8
|
+
static new(config, caller, log, disableLogging) {
|
|
9
|
+
if (!assert(log, caller, config, 'limit', 'units', 'period')) {
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
12
|
+
if (!isValidTimeUnits(config.units)) {
|
|
13
|
+
log.error(strings.accessory.limiter.badUnits, caller, `'${config.units}'`, printableValues(TimeUnits));
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
16
|
+
let periodLength;
|
|
17
|
+
switch (config.period) {
|
|
18
|
+
case TimePeriod.HOUR:
|
|
19
|
+
periodLength = HOUR;
|
|
20
|
+
break;
|
|
21
|
+
case TimePeriod.DAY:
|
|
22
|
+
periodLength = DAY;
|
|
23
|
+
break;
|
|
24
|
+
case TimePeriod.WEEK:
|
|
25
|
+
periodLength = 7 * DAY;
|
|
26
|
+
break;
|
|
27
|
+
case TimePeriod.MONTH:
|
|
28
|
+
periodLength = 31 * DAY;
|
|
29
|
+
break;
|
|
30
|
+
default:
|
|
31
|
+
log.error(strings.accessory.limiter.badPeriod, caller, `'${config.period}'`, printableValues(TimePeriod));
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
const delay = getDelay(config.limit, config.units);
|
|
35
|
+
if (delay > periodLength) {
|
|
36
|
+
log.error(strings.accessory.limiter.limitExceedsPeriod, caller);
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
return new Limiter(config, caller, log, disableLogging);
|
|
40
|
+
}
|
|
41
|
+
limit = { timeRemaining: -1, resetTimestamp: -1 };
|
|
42
|
+
startedAtTimestamp;
|
|
43
|
+
constructor(config, caller, log, disableLogging) {
|
|
44
|
+
super(caller, log, disableLogging);
|
|
45
|
+
this.config = config;
|
|
46
|
+
setTimeout(async () => {
|
|
47
|
+
const cache = await storageGet(this.limitStorageKey);
|
|
48
|
+
if (cache) {
|
|
49
|
+
this.limit = cache;
|
|
50
|
+
}
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
get limitStorageKey() {
|
|
54
|
+
const identifier = this.config.id ?? this.caller;
|
|
55
|
+
return `${identifier}:${STORAGE_KEY_SUFFIX_LIMIT}`;
|
|
56
|
+
}
|
|
57
|
+
start(callback) {
|
|
58
|
+
super.cancel();
|
|
59
|
+
if (Date.now() - this.limit.resetTimestamp >= 0 || this.limit.timeRemaining === -1) {
|
|
60
|
+
this.resetTimeRemaining();
|
|
61
|
+
this.resetPeriod();
|
|
62
|
+
}
|
|
63
|
+
const timeUntilPeriodReset = this.limit.resetTimestamp - Date.now();
|
|
64
|
+
if (this.limit.timeRemaining > timeUntilPeriodReset) {
|
|
65
|
+
this.resetTimeRemaining();
|
|
66
|
+
this.limit.timeRemaining += timeUntilPeriodReset;
|
|
67
|
+
}
|
|
68
|
+
if (this.limit.timeRemaining > 0) {
|
|
69
|
+
this.startedAtTimestamp = Date.now();
|
|
70
|
+
}
|
|
71
|
+
this.logTimeRemaining();
|
|
72
|
+
this.timeout = setTimeout(async () => {
|
|
73
|
+
this.reset();
|
|
74
|
+
await callback();
|
|
75
|
+
}, Math.max(this.limit.timeRemaining, 0.1 * SECOND));
|
|
76
|
+
this.storeLimit();
|
|
77
|
+
}
|
|
78
|
+
reset() {
|
|
79
|
+
super.reset();
|
|
80
|
+
if (!this.startedAtTimestamp) {
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
const elapsedTime = Date.now() - this.startedAtTimestamp;
|
|
84
|
+
this.limit.timeRemaining = Math.max(0, this.limit.timeRemaining - elapsedTime);
|
|
85
|
+
this.startedAtTimestamp = undefined;
|
|
86
|
+
this.logTimeRemaining();
|
|
87
|
+
this.storeLimit();
|
|
88
|
+
}
|
|
89
|
+
resetTimeRemaining() {
|
|
90
|
+
this.limit.timeRemaining = this.getDelay(this.config.limit, this.config.units);
|
|
91
|
+
}
|
|
92
|
+
resetPeriod() {
|
|
93
|
+
const date = new Date();
|
|
94
|
+
switch (this.config.period) {
|
|
95
|
+
case TimePeriod.HOUR:
|
|
96
|
+
date.setHours(date.getHours() + 1, 0, 0, 0);
|
|
97
|
+
break;
|
|
98
|
+
case TimePeriod.DAY:
|
|
99
|
+
date.setDate(date.getDate() + 1);
|
|
100
|
+
date.setHours(0, 0, 0, 0);
|
|
101
|
+
break;
|
|
102
|
+
case TimePeriod.WEEK:
|
|
103
|
+
date.setDate(date.getDate() + ((7 - date.getDay()) % 7 || 7));
|
|
104
|
+
date.setHours(0, 0, 0, 0);
|
|
105
|
+
break;
|
|
106
|
+
case TimePeriod.MONTH:
|
|
107
|
+
date.setMonth(date.getMonth() + 1, 1);
|
|
108
|
+
date.setHours(0, 0, 0, 0);
|
|
109
|
+
break;
|
|
110
|
+
}
|
|
111
|
+
this.limit.resetTimestamp = date.getTime();
|
|
112
|
+
}
|
|
113
|
+
storeLimit() {
|
|
114
|
+
storageSet(this.limitStorageKey, this.limit);
|
|
115
|
+
}
|
|
116
|
+
logTimeRemaining() {
|
|
117
|
+
if (this.limit.timeRemaining < 0) {
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
120
|
+
if (this.limit.timeRemaining === 0) {
|
|
121
|
+
this.logIfDesired(strings.accessory.limiter.expired);
|
|
122
|
+
}
|
|
123
|
+
else if (this.limit.timeRemaining < MINUTE) {
|
|
124
|
+
this.logIfDesired(strings.accessory.limiter.remainingSeconds, this.limit.timeRemaining / SECOND);
|
|
125
|
+
}
|
|
126
|
+
else if (this.limit.timeRemaining < HOUR) {
|
|
127
|
+
this.logIfDesired(strings.accessory.limiter.remainingMinutes, this.limit.timeRemaining / MINUTE);
|
|
128
|
+
}
|
|
129
|
+
else if (this.limit.timeRemaining < DAY) {
|
|
130
|
+
this.logIfDesired(strings.accessory.limiter.remainingHours, this.limit.timeRemaining / HOUR);
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
this.logIfDesired(strings.accessory.limiter.remainingDayPlus);
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
//# sourceMappingURL=limiter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"limiter.js","sourceRoot":"","sources":["../../src/timeout/limiter.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ export declare class Schedule extends Timeout {
|
|
|
7
7
|
static new(schedule: ScheduleConfig, caller: string, log: Log, disableLogging: boolean, callback: () => Promise<void>): Schedule | undefined;
|
|
8
8
|
private cronjob?;
|
|
9
9
|
private constructor();
|
|
10
|
-
protected get cancelString(): string;
|
|
11
10
|
private startTimeout;
|
|
12
11
|
private startCron;
|
|
13
12
|
teardown(): void;
|
package/dist/timeout/schedule.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { CronJob, validateCronExpression } from 'cron';
|
|
2
2
|
import { DelayLogStrings, Timeout } from './timeout.js';
|
|
3
3
|
import { strings } from '../i18n/i18n.js';
|
|
4
|
-
import { ScheduleType } from '../model/enums.js';
|
|
4
|
+
import { isValidTimeUnits, printableValues, ScheduleType, TimeUnits } from '../model/enums.js';
|
|
5
5
|
import { assert } from '../tools/validation.js';
|
|
6
6
|
const CRON_CUSTOM = 'CRON_CUSTOM';
|
|
7
7
|
export class Schedule extends Timeout {
|
|
@@ -16,6 +16,10 @@ export class Schedule extends Timeout {
|
|
|
16
16
|
if (!assert(log, caller, schedule, 'interval', 'units')) {
|
|
17
17
|
return;
|
|
18
18
|
}
|
|
19
|
+
if (!isValidTimeUnits(schedule.units)) {
|
|
20
|
+
log.error(strings.accessory.schedule.badUnits, caller, `'${schedule.units}'`, printableValues(TimeUnits));
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
19
23
|
break;
|
|
20
24
|
case ScheduleType.CRON:
|
|
21
25
|
if (!assert(log, caller, schedule, 'cron')) {
|
|
@@ -24,6 +28,10 @@ export class Schedule extends Timeout {
|
|
|
24
28
|
if (schedule.cron === CRON_CUSTOM && !assert(log, caller, schedule, 'cronCustom')) {
|
|
25
29
|
return;
|
|
26
30
|
}
|
|
31
|
+
break;
|
|
32
|
+
default:
|
|
33
|
+
log.error(strings.accessory.schedule.badType, caller, `'${schedule.type}'`, printableValues(ScheduleType));
|
|
34
|
+
return;
|
|
27
35
|
}
|
|
28
36
|
return new Schedule(schedule, caller, log, disableLogging, callback);
|
|
29
37
|
}
|
|
@@ -41,9 +49,6 @@ export class Schedule extends Timeout {
|
|
|
41
49
|
break;
|
|
42
50
|
}
|
|
43
51
|
}
|
|
44
|
-
get cancelString() {
|
|
45
|
-
throw new Error('Method not implemented.');
|
|
46
|
-
}
|
|
47
52
|
startTimeout() {
|
|
48
53
|
this.reset();
|
|
49
54
|
const logStrings = DelayLogStrings(strings.accessory.schedule.intervalMilliseconds, strings.accessory.schedule.intervalSeconds, strings.accessory.schedule.intervalMinutes, strings.accessory.schedule.intervalHours);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schedule.js","sourceRoot":"","sources":["../../src/timeout/schedule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,MAAM,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,MAAO,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"schedule.js","sourceRoot":"","sources":["../../src/timeout/schedule.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { TimeUnits } from '../model/enums.js';
|
|
2
2
|
import { Log } from '../tools/log.js';
|
|
3
|
+
export declare const SECOND = 1000;
|
|
4
|
+
export declare const MINUTE: number;
|
|
5
|
+
export declare const HOUR: number;
|
|
6
|
+
export declare const DAY: number;
|
|
3
7
|
type DelayLogStrings = {
|
|
4
8
|
milliseconds: string;
|
|
5
9
|
seconds: string;
|
|
@@ -7,17 +11,17 @@ type DelayLogStrings = {
|
|
|
7
11
|
hours: string;
|
|
8
12
|
};
|
|
9
13
|
export declare function DelayLogStrings(milliseconds: string, seconds: string, minutes: string, hours: string): DelayLogStrings;
|
|
14
|
+
export declare function getDelay(rawTime: number, units: TimeUnits, random?: boolean | undefined, logStrings?: DelayLogStrings | undefined, log?: Log | undefined, caller?: string | undefined): number;
|
|
10
15
|
export declare abstract class Timeout {
|
|
11
16
|
protected readonly caller: string;
|
|
12
17
|
protected readonly log: Log;
|
|
13
18
|
private readonly disableLogging;
|
|
14
19
|
protected timeout?: NodeJS.Timeout;
|
|
15
20
|
protected constructor(caller: string, log: Log, disableLogging: boolean);
|
|
16
|
-
protected abstract get cancelString(): string;
|
|
17
21
|
cancel(): void;
|
|
18
22
|
teardown(): void;
|
|
19
23
|
protected reset(): void;
|
|
20
|
-
protected getDelay(rawTime: number, units: TimeUnits, random
|
|
24
|
+
protected getDelay(rawTime: number, units: TimeUnits, random?: boolean | undefined, logStrings?: DelayLogStrings | undefined): number;
|
|
21
25
|
protected logIfDesired(message: string, ...parameters: (string | number)[]): void;
|
|
22
26
|
}
|
|
23
27
|
export {};
|
package/dist/timeout/timeout.js
CHANGED
|
@@ -1,10 +1,67 @@
|
|
|
1
1
|
import { TimeUnits } from '../model/enums.js';
|
|
2
|
-
const SECOND = 1000;
|
|
3
|
-
const MINUTE = 60 * SECOND;
|
|
4
|
-
const HOUR = 60 * MINUTE;
|
|
2
|
+
export const SECOND = 1000;
|
|
3
|
+
export const MINUTE = 60 * SECOND;
|
|
4
|
+
export const HOUR = 60 * MINUTE;
|
|
5
|
+
export const DAY = 24 * HOUR;
|
|
5
6
|
export function DelayLogStrings(milliseconds, seconds, minutes, hours) {
|
|
6
7
|
return { milliseconds: milliseconds, seconds: seconds, minutes: minutes, hours: hours };
|
|
7
8
|
}
|
|
9
|
+
export function getDelay(rawTime, units, random = undefined, logStrings = undefined, log = undefined, caller = undefined) {
|
|
10
|
+
let time;
|
|
11
|
+
switch (units) {
|
|
12
|
+
case TimeUnits.MILLISECONDS:
|
|
13
|
+
time = rawTime;
|
|
14
|
+
break;
|
|
15
|
+
case TimeUnits.SECONDS:
|
|
16
|
+
time = rawTime * SECOND;
|
|
17
|
+
break;
|
|
18
|
+
case TimeUnits.MINUTES:
|
|
19
|
+
time = rawTime * MINUTE;
|
|
20
|
+
break;
|
|
21
|
+
case TimeUnits.HOURS:
|
|
22
|
+
time = rawTime * HOUR;
|
|
23
|
+
break;
|
|
24
|
+
}
|
|
25
|
+
if (random) {
|
|
26
|
+
time = Math.floor(Math.max(1, Math.random() * time));
|
|
27
|
+
if (time < SECOND) {
|
|
28
|
+
units = TimeUnits.MILLISECONDS;
|
|
29
|
+
}
|
|
30
|
+
else if (time < MINUTE) {
|
|
31
|
+
units = TimeUnits.SECONDS;
|
|
32
|
+
}
|
|
33
|
+
else if (time < HOUR) {
|
|
34
|
+
units = TimeUnits.MINUTES;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
if (logStrings === undefined || log === undefined) {
|
|
38
|
+
return time;
|
|
39
|
+
}
|
|
40
|
+
let string;
|
|
41
|
+
let divisor;
|
|
42
|
+
switch (units) {
|
|
43
|
+
case TimeUnits.MILLISECONDS:
|
|
44
|
+
string = logStrings?.milliseconds;
|
|
45
|
+
divisor = 1;
|
|
46
|
+
break;
|
|
47
|
+
case TimeUnits.SECONDS:
|
|
48
|
+
string = logStrings?.seconds;
|
|
49
|
+
divisor = SECOND;
|
|
50
|
+
break;
|
|
51
|
+
case TimeUnits.MINUTES:
|
|
52
|
+
string = logStrings?.minutes;
|
|
53
|
+
divisor = MINUTE;
|
|
54
|
+
break;
|
|
55
|
+
case TimeUnits.HOURS:
|
|
56
|
+
string = logStrings?.hours;
|
|
57
|
+
divisor = HOUR;
|
|
58
|
+
break;
|
|
59
|
+
}
|
|
60
|
+
if (string) {
|
|
61
|
+
log.always(string, caller, Math.round(time / divisor));
|
|
62
|
+
}
|
|
63
|
+
return time;
|
|
64
|
+
}
|
|
8
65
|
export class Timeout {
|
|
9
66
|
caller;
|
|
10
67
|
log;
|
|
@@ -16,9 +73,6 @@ export class Timeout {
|
|
|
16
73
|
this.disableLogging = disableLogging;
|
|
17
74
|
}
|
|
18
75
|
cancel() {
|
|
19
|
-
if (this.timeout) {
|
|
20
|
-
this.logIfDesired(this.cancelString);
|
|
21
|
-
}
|
|
22
76
|
this.reset();
|
|
23
77
|
}
|
|
24
78
|
teardown() {
|
|
@@ -28,58 +82,8 @@ export class Timeout {
|
|
|
28
82
|
clearTimeout(this.timeout);
|
|
29
83
|
this.timeout = undefined;
|
|
30
84
|
}
|
|
31
|
-
getDelay(rawTime, units, random,
|
|
32
|
-
|
|
33
|
-
switch (units) {
|
|
34
|
-
case TimeUnits.MILLISECONDS:
|
|
35
|
-
time = rawTime;
|
|
36
|
-
break;
|
|
37
|
-
case TimeUnits.SECONDS:
|
|
38
|
-
time = rawTime * SECOND;
|
|
39
|
-
break;
|
|
40
|
-
case TimeUnits.MINUTES:
|
|
41
|
-
time = rawTime * MINUTE;
|
|
42
|
-
break;
|
|
43
|
-
case TimeUnits.HOURS:
|
|
44
|
-
time = rawTime * HOUR;
|
|
45
|
-
break;
|
|
46
|
-
}
|
|
47
|
-
if (random) {
|
|
48
|
-
time = Math.floor(Math.max(1, Math.random() * time));
|
|
49
|
-
if (time < SECOND) {
|
|
50
|
-
units = TimeUnits.MILLISECONDS;
|
|
51
|
-
}
|
|
52
|
-
else if (time < MINUTE) {
|
|
53
|
-
units = TimeUnits.SECONDS;
|
|
54
|
-
}
|
|
55
|
-
else if (time < HOUR) {
|
|
56
|
-
units = TimeUnits.MINUTES;
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
if (!this.disableLogging) {
|
|
60
|
-
let string;
|
|
61
|
-
let divisor;
|
|
62
|
-
switch (units) {
|
|
63
|
-
case TimeUnits.MILLISECONDS:
|
|
64
|
-
string = strings.milliseconds;
|
|
65
|
-
divisor = 1;
|
|
66
|
-
break;
|
|
67
|
-
case TimeUnits.SECONDS:
|
|
68
|
-
string = strings.seconds;
|
|
69
|
-
divisor = SECOND;
|
|
70
|
-
break;
|
|
71
|
-
case TimeUnits.MINUTES:
|
|
72
|
-
string = strings.minutes;
|
|
73
|
-
divisor = MINUTE;
|
|
74
|
-
break;
|
|
75
|
-
case TimeUnits.HOURS:
|
|
76
|
-
string = strings.hours;
|
|
77
|
-
divisor = HOUR;
|
|
78
|
-
break;
|
|
79
|
-
}
|
|
80
|
-
this.log.always(string, this.caller, Math.round(time / divisor));
|
|
81
|
-
}
|
|
82
|
-
return time;
|
|
85
|
+
getDelay(rawTime, units, random = undefined, logStrings = undefined) {
|
|
86
|
+
return getDelay(rawTime, units, random, logStrings, this.log, this.caller);
|
|
83
87
|
}
|
|
84
88
|
logIfDesired(message, ...parameters) {
|
|
85
89
|
if (this.disableLogging) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../src/timeout/timeout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAI9C,MAAM,MAAM,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../src/timeout/timeout.ts"],"names":[],"mappings":"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"}
|
package/dist/timeout/timer.d.ts
CHANGED
|
@@ -5,6 +5,6 @@ export declare class Timer extends Timeout {
|
|
|
5
5
|
private readonly config;
|
|
6
6
|
static new(config: TimerConfig, caller: string, log: Log, disableLogging: boolean): Timer | undefined;
|
|
7
7
|
private constructor();
|
|
8
|
-
protected get cancelString(): string;
|
|
9
8
|
start(callback: () => Promise<void>): void;
|
|
9
|
+
cancel(): void;
|
|
10
10
|
}
|
package/dist/timeout/timer.js
CHANGED
|
@@ -1,11 +1,16 @@
|
|
|
1
1
|
import { DelayLogStrings, Timeout } from './timeout.js';
|
|
2
2
|
import { strings } from '../i18n/i18n.js';
|
|
3
3
|
import { assert } from '../tools/validation.js';
|
|
4
|
+
import { isValidTimeUnits, printableValues, TimeUnits } from '../model/enums.js';
|
|
4
5
|
export class Timer extends Timeout {
|
|
5
6
|
config;
|
|
6
7
|
static new(config, caller, log, disableLogging) {
|
|
7
8
|
if (!assert(log, caller, config, 'delay', 'units')) {
|
|
8
|
-
return
|
|
9
|
+
return;
|
|
10
|
+
}
|
|
11
|
+
if (!isValidTimeUnits(config.units)) {
|
|
12
|
+
log.error(strings.accessory.timer.badUnits, caller, `'${config.units}'`, printableValues(TimeUnits));
|
|
13
|
+
return;
|
|
9
14
|
}
|
|
10
15
|
return new Timer(config, caller, log, disableLogging);
|
|
11
16
|
}
|
|
@@ -13,9 +18,6 @@ export class Timer extends Timeout {
|
|
|
13
18
|
super(caller, log, disableLogging);
|
|
14
19
|
this.config = config;
|
|
15
20
|
}
|
|
16
|
-
get cancelString() {
|
|
17
|
-
return strings.accessory.timer.cancel;
|
|
18
|
-
}
|
|
19
21
|
start(callback) {
|
|
20
22
|
this.cancel();
|
|
21
23
|
const logStrings = DelayLogStrings(strings.accessory.timer.setMilliseconds, strings.accessory.timer.setSeconds, strings.accessory.timer.setMinutes, strings.accessory.timer.setHours);
|
|
@@ -25,5 +27,11 @@ export class Timer extends Timeout {
|
|
|
25
27
|
await callback();
|
|
26
28
|
}, delay);
|
|
27
29
|
}
|
|
30
|
+
cancel() {
|
|
31
|
+
if (this.timeout) {
|
|
32
|
+
this.logIfDesired(strings.accessory.timer.cancel);
|
|
33
|
+
}
|
|
34
|
+
super.cancel();
|
|
35
|
+
}
|
|
28
36
|
}
|
|
29
37
|
//# sourceMappingURL=timer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timer.js","sourceRoot":"","sources":["../../src/timeout/timer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAIxD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAG1C,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"timer.js","sourceRoot":"","sources":["../../src/timeout/timer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAIxD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAG1C,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEjF,MAAM,OAAO,KAAM,SAAQ,OAAO;IAiBb;IAfnB,MAAM,CAAC,GAAG,CAAC,MAAmB,EAAE,MAAc,EAAE,GAAQ,EAAE,cAAuB;QAE/E,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;YACnD,OAAO;QACT,CAAC;QAED,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACpC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,MAAM,CAAC,KAAK,GAAG,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC;YACrG,OAAO;QACT,CAAC;QAED,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,CAAC;IACxD,CAAC;IAED,YACmB,MAAmB,EACpC,MAAc,EACd,GAAQ,EACR,cAAuB;QAEvB,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,CAAC;QALlB,WAAM,GAAN,MAAM,CAAa;IAMtC,CAAC;IAEM,KAAK,CAAC,QAA8B;QAEzC,IAAI,CAAC,MAAM,EAAE,CAAC;QAEd,MAAM,UAAU,GAAG,eAAe,CAChC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,eAAe,EACvC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,EAClC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,EAClC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CACjC,CAAC;QAEF,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAElG,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;YACnC,IAAI,CAAC,KAAK,EAAE,CAAC;YACb,MAAM,QAAQ,EAAE,CAAC;QACnB,CAAC,EAAE,KAAK,CAAC,CAAC;IACZ,CAAC;IAEQ,MAAM;QAEb,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC;QAED,KAAK,CAAC,MAAM,EAAE,CAAC;IACjB,CAAC;CACF"}
|
package/dist/tools/storage.d.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
export declare const STORAGE_KEY_SUFFIX_DEFAULT_STATE = "DefaultState";
|
|
2
2
|
export declare const STORAGE_KEY_SUFFIX_DEFAULT_BRIGHTNESS = "Brightness";
|
|
3
3
|
export declare const STORAGE_KEY_SUFFIX_DEFAULT_TEMPERATURE = "Temperature";
|
|
4
|
-
export declare
|
|
5
|
-
export declare function
|
|
4
|
+
export declare const STORAGE_KEY_SUFFIX_LIMIT = "Limit";
|
|
5
|
+
export declare function initStorage(persistPath: string): Promise<void>;
|
|
6
|
+
export declare function storageGet(key: string): Promise<any>;
|
|
7
|
+
export declare function storageSet(key: string, value: any): Promise<void>;
|
package/dist/tools/storage.js
CHANGED
|
@@ -2,13 +2,13 @@ import storage from 'node-persist';
|
|
|
2
2
|
export const STORAGE_KEY_SUFFIX_DEFAULT_STATE = 'DefaultState';
|
|
3
3
|
export const STORAGE_KEY_SUFFIX_DEFAULT_BRIGHTNESS = 'Brightness';
|
|
4
4
|
export const STORAGE_KEY_SUFFIX_DEFAULT_TEMPERATURE = 'Temperature';
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
export const STORAGE_KEY_SUFFIX_LIMIT = 'Limit';
|
|
6
|
+
export async function initStorage(persistPath) {
|
|
7
|
+
await storage.init({ dir: persistPath, forgiveParseErrors: true });
|
|
7
8
|
}
|
|
8
9
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
9
|
-
export async function storageGet(
|
|
10
|
+
export async function storageGet(key) {
|
|
10
11
|
try {
|
|
11
|
-
await init(dir);
|
|
12
12
|
return await storage.get(key);
|
|
13
13
|
}
|
|
14
14
|
catch (err) {
|
|
@@ -16,9 +16,8 @@ export async function storageGet(dir, key) {
|
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
18
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
19
|
-
export async function storageSet(
|
|
19
|
+
export async function storageSet(key, value) {
|
|
20
20
|
try {
|
|
21
|
-
await init(dir);
|
|
22
21
|
storage.set(key, value);
|
|
23
22
|
}
|
|
24
23
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/tools/storage.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,MAAM,CAAC,MAAM,gCAAgC,GAAG,cAAc,CAAC;AAC/D,MAAM,CAAC,MAAM,qCAAqC,GAAG,YAAY,CAAC;AAClE,MAAM,CAAC,MAAM,sCAAsC,GAAG,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/tools/storage.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,MAAM,CAAC,MAAM,gCAAgC,GAAG,cAAc,CAAC;AAC/D,MAAM,CAAC,MAAM,qCAAqC,GAAG,YAAY,CAAC;AAClE,MAAM,CAAC,MAAM,sCAAsC,GAAG,aAAa,CAAC;AACpE,MAAM,CAAC,MAAM,wBAAwB,GAAG,OAAO,CAAC;AAEhD,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,WAAmB;IACnD,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;AACrE,CAAC;AAED,8DAA8D;AAC9D,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,GAAW;IAC1C,IAAI,CAAC;QACH,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,UAAU;IACZ,CAAC;AACH,CAAC;AAED,8DAA8D;AAC9D,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,GAAW,EAAE,KAAU;IACtD,IAAI,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC;QACP,UAAU;IACZ,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
"name": "homebridge-dummy",
|
|
3
3
|
"platform": "HomebridgeDummy",
|
|
4
4
|
"displayName": "Homebridge Dummy",
|
|
5
|
-
"description": "Create
|
|
5
|
+
"description": "Create Homebridge accessories to help with automation and control — scheduling, delays, sensors, commands, webhooks, and more",
|
|
6
6
|
"type": "module",
|
|
7
|
-
"version": "1.
|
|
7
|
+
"version": "1.3.0-beta.0",
|
|
8
8
|
"homepage": "https://github.com/mpatfield/homebridge-dummy#readme",
|
|
9
9
|
"repository": {
|
|
10
10
|
"type": "git",
|
|
@@ -36,18 +36,14 @@
|
|
|
36
36
|
"automation",
|
|
37
37
|
"timer",
|
|
38
38
|
"delay",
|
|
39
|
-
"delay-switch",
|
|
40
39
|
"reset",
|
|
41
40
|
"schedule",
|
|
42
41
|
"command",
|
|
43
42
|
"cmd",
|
|
44
43
|
"cmdtrigger",
|
|
45
44
|
"http",
|
|
46
|
-
"
|
|
47
|
-
"
|
|
48
|
-
"contact",
|
|
49
|
-
"leak",
|
|
50
|
-
"occupancy"
|
|
45
|
+
"webhook",
|
|
46
|
+
"sensor"
|
|
51
47
|
],
|
|
52
48
|
"engines": {
|
|
53
49
|
"homebridge": "^1.8.0 || ^2.0.0-beta.0",
|