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/model/types.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ export declare enum AccessoryType {
|
|
|
7
7
|
LockMechanism = "LockMechanism",
|
|
8
8
|
Outlet = "Outlet",
|
|
9
9
|
Switch = "Switch",
|
|
10
|
+
Thermostat = "Thermostat",
|
|
10
11
|
Window = "Window",
|
|
11
12
|
WindowCovering = "WindowCovering"
|
|
12
13
|
}
|
|
@@ -36,6 +37,12 @@ export declare enum DefaultPosition {
|
|
|
36
37
|
OPEN = "open",
|
|
37
38
|
CLOSED = "closed"
|
|
38
39
|
}
|
|
40
|
+
export declare enum DefaultThermostatState {
|
|
41
|
+
OFF = "off",
|
|
42
|
+
COOL = "cool",
|
|
43
|
+
HEAT = "heat",
|
|
44
|
+
AUTO = "auto"
|
|
45
|
+
}
|
|
39
46
|
export type LegacyAccessoryConfig = AccessoryConfig & {
|
|
40
47
|
name: string;
|
|
41
48
|
dimmer?: boolean;
|
|
@@ -52,28 +59,49 @@ export type DummyPlatformConfig = PlatformConfig & {
|
|
|
52
59
|
migrationNeeded?: boolean;
|
|
53
60
|
};
|
|
54
61
|
export declare enum TimeUnits {
|
|
62
|
+
MILLISECONDS = "MILLISECONDS",
|
|
55
63
|
SECONDS = "SECONDS",
|
|
56
64
|
MINUTES = "MINUTES",
|
|
57
65
|
HOURS = "HOURS"
|
|
58
66
|
}
|
|
67
|
+
export declare enum ScheduleType {
|
|
68
|
+
INTERVAL = "INTERVAL",
|
|
69
|
+
CRON = "CRON"
|
|
70
|
+
}
|
|
71
|
+
export declare enum TemperatureUnits {
|
|
72
|
+
CELSIUS = "C",
|
|
73
|
+
FAHRENHEIT = "F"
|
|
74
|
+
}
|
|
59
75
|
export type Assertable = {};
|
|
76
|
+
export type ScheduleConfig = Assertable & {
|
|
77
|
+
type: ScheduleType;
|
|
78
|
+
interval?: number;
|
|
79
|
+
units?: TimeUnits;
|
|
80
|
+
random?: boolean;
|
|
81
|
+
cron?: string;
|
|
82
|
+
};
|
|
60
83
|
export type TimerConfig = Assertable & {
|
|
61
84
|
delay: number;
|
|
62
85
|
units: TimeUnits;
|
|
63
86
|
random?: boolean;
|
|
64
87
|
};
|
|
88
|
+
export type SensorConfig = Assertable & {
|
|
89
|
+
type: SensorType;
|
|
90
|
+
timerControlled?: boolean;
|
|
91
|
+
};
|
|
65
92
|
export type DummyConfig = {
|
|
66
93
|
id: string;
|
|
67
94
|
name: string;
|
|
68
95
|
type: AccessoryType;
|
|
69
96
|
groupName?: string;
|
|
97
|
+
sensor?: SensorType | SensorConfig;
|
|
70
98
|
timer?: TimerConfig;
|
|
99
|
+
schedule?: ScheduleConfig;
|
|
71
100
|
resetOnRestart?: boolean;
|
|
72
101
|
disableLogging?: boolean;
|
|
73
102
|
};
|
|
74
103
|
export type OnOffConfig = DummyConfig & {
|
|
75
104
|
defaultOn?: CharacteristicValue;
|
|
76
|
-
sensor?: SensorType;
|
|
77
105
|
commandOn?: string;
|
|
78
106
|
commandOff?: string;
|
|
79
107
|
};
|
|
@@ -87,6 +115,14 @@ export type LockConfig = DummyConfig & {
|
|
|
87
115
|
commandLock?: string;
|
|
88
116
|
commandUnlock?: string;
|
|
89
117
|
};
|
|
118
|
+
export type ThermostatConfig = DummyConfig & {
|
|
119
|
+
temperatureUnits?: TemperatureUnits;
|
|
120
|
+
defaultThermostatState?: DefaultThermostatState;
|
|
121
|
+
defaultTemperature?: number;
|
|
122
|
+
commandOn?: string;
|
|
123
|
+
commandOff?: string;
|
|
124
|
+
commandTemperature?: string;
|
|
125
|
+
};
|
|
90
126
|
export type PositionConfig = DummyConfig & {
|
|
91
127
|
defaultPosition?: DefaultPosition;
|
|
92
128
|
commandOpen?: string;
|
package/dist/model/types.js
CHANGED
|
@@ -5,6 +5,7 @@ export var AccessoryType;
|
|
|
5
5
|
AccessoryType["LockMechanism"] = "LockMechanism";
|
|
6
6
|
AccessoryType["Outlet"] = "Outlet";
|
|
7
7
|
AccessoryType["Switch"] = "Switch";
|
|
8
|
+
AccessoryType["Thermostat"] = "Thermostat";
|
|
8
9
|
AccessoryType["Window"] = "Window";
|
|
9
10
|
AccessoryType["WindowCovering"] = "WindowCovering";
|
|
10
11
|
})(AccessoryType || (AccessoryType = {}));
|
|
@@ -38,10 +39,28 @@ export var DefaultPosition;
|
|
|
38
39
|
DefaultPosition["OPEN"] = "open";
|
|
39
40
|
DefaultPosition["CLOSED"] = "closed";
|
|
40
41
|
})(DefaultPosition || (DefaultPosition = {}));
|
|
42
|
+
export var DefaultThermostatState;
|
|
43
|
+
(function (DefaultThermostatState) {
|
|
44
|
+
DefaultThermostatState["OFF"] = "off";
|
|
45
|
+
DefaultThermostatState["COOL"] = "cool";
|
|
46
|
+
DefaultThermostatState["HEAT"] = "heat";
|
|
47
|
+
DefaultThermostatState["AUTO"] = "auto";
|
|
48
|
+
})(DefaultThermostatState || (DefaultThermostatState = {}));
|
|
41
49
|
export var TimeUnits;
|
|
42
50
|
(function (TimeUnits) {
|
|
51
|
+
TimeUnits["MILLISECONDS"] = "MILLISECONDS";
|
|
43
52
|
TimeUnits["SECONDS"] = "SECONDS";
|
|
44
53
|
TimeUnits["MINUTES"] = "MINUTES";
|
|
45
54
|
TimeUnits["HOURS"] = "HOURS";
|
|
46
55
|
})(TimeUnits || (TimeUnits = {}));
|
|
56
|
+
export var ScheduleType;
|
|
57
|
+
(function (ScheduleType) {
|
|
58
|
+
ScheduleType["INTERVAL"] = "INTERVAL";
|
|
59
|
+
ScheduleType["CRON"] = "CRON";
|
|
60
|
+
})(ScheduleType || (ScheduleType = {}));
|
|
61
|
+
export var TemperatureUnits;
|
|
62
|
+
(function (TemperatureUnits) {
|
|
63
|
+
TemperatureUnits["CELSIUS"] = "C";
|
|
64
|
+
TemperatureUnits["FAHRENHEIT"] = "F";
|
|
65
|
+
})(TemperatureUnits || (TemperatureUnits = {}));
|
|
47
66
|
//# sourceMappingURL=types.js.map
|
package/dist/model/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/model/types.ts"],"names":[],"mappings":"AAKA,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/model/types.ts"],"names":[],"mappings":"AAKA,MAAM,CAAN,IAAY,aASX;AATD,WAAY,aAAa;IACvB,8BAAa,CAAA;IACb,wCAAuB,CAAA;IACvB,gDAA+B,CAAA;IAC/B,kCAAiB,CAAA;IACjB,kCAAiB,CAAA;IACjB,0CAAyB,CAAA;IACzB,kCAAiB,CAAA;IACjB,kDAAiC,CAAA;AACnC,CAAC,EATW,aAAa,KAAb,aAAa,QASxB;AAED,MAAM,CAAN,IAAY,UAQX;AARD,WAAY,UAAU;IACpB,yDAA2C,CAAA;IAC3C,2DAA6C,CAAA;IAC7C,6CAA+B,CAAA;IAC/B,uCAAyB,CAAA;IACzB,2CAA6B,CAAA;IAC7B,iDAAmC,CAAA;IACnC,yCAA2B,CAAA;AAC7B,CAAC,EARW,UAAU,KAAV,UAAU,QAQrB;AAED,MAAM,CAAN,IAAY,oBAQX;AARD,WAAY,oBAAoB;IAC9B,uEAA+C,CAAA;IAC/C,yEAAiD,CAAA;IACjD,iEAAyC,CAAA;IACzC,qDAA6B,CAAA;IAC7B,yDAAiC,CAAA;IACjC,+DAAuC,CAAA;IACvC,uDAA+B,CAAA;AACjC,CAAC,EARW,oBAAoB,KAApB,oBAAoB,QAQ/B;AAED,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,qCAAiB,CAAA;IACjB,yCAAqB,CAAA;AACvB,CAAC,EAHW,gBAAgB,KAAhB,gBAAgB,QAG3B;AAED,MAAM,CAAN,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,gCAAa,CAAA;IACb,oCAAiB,CAAA;AACnB,CAAC,EAHW,eAAe,KAAf,eAAe,QAG1B;AAED,MAAM,CAAN,IAAY,sBAKX;AALD,WAAY,sBAAsB;IAChC,qCAAW,CAAA;IACX,uCAAa,CAAA;IACb,uCAAa,CAAA;IACb,uCAAa,CAAA;AACf,CAAC,EALW,sBAAsB,KAAtB,sBAAsB,QAKjC;AAmBD,MAAM,CAAN,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,0CAA6B,CAAA;IAC7B,gCAAmB,CAAA;IACnB,gCAAmB,CAAA;IACnB,4BAAe,CAAA;AACjB,CAAC,EALW,SAAS,KAAT,SAAS,QAKpB;AAED,MAAM,CAAN,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,qCAAqB,CAAA;IACrB,6BAAa,CAAA;AACf,CAAC,EAHW,YAAY,KAAZ,YAAY,QAGvB;AAED,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,iCAAa,CAAA;IACb,oCAAgB,CAAA;AAClB,CAAC,EAHW,gBAAgB,KAAhB,gBAAgB,QAG3B"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { Timeout } from './timeout.js';
|
|
2
|
+
import { ScheduleConfig } from '../model/types.js';
|
|
3
|
+
import { Log } from '../tools/log.js';
|
|
4
|
+
export declare class Schedule extends Timeout {
|
|
5
|
+
private readonly schedule;
|
|
6
|
+
private readonly callback;
|
|
7
|
+
static new(schedule: ScheduleConfig, caller: string, log: Log, disableLogging: boolean, callback: () => Promise<void>): Schedule | undefined;
|
|
8
|
+
private cronjob?;
|
|
9
|
+
private constructor();
|
|
10
|
+
protected get cancelString(): string;
|
|
11
|
+
private startTimeout;
|
|
12
|
+
private startCron;
|
|
13
|
+
teardown(): void;
|
|
14
|
+
}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import { CronJob, validateCronExpression } from 'cron';
|
|
2
|
+
import { DelayLogStrings, Timeout } from './timeout.js';
|
|
3
|
+
import { strings } from '../i18n/i18n.js';
|
|
4
|
+
import { ScheduleType } from '../model/types.js';
|
|
5
|
+
import { assert } from '../tools/validation.js';
|
|
6
|
+
export class Schedule extends Timeout {
|
|
7
|
+
schedule;
|
|
8
|
+
callback;
|
|
9
|
+
static new(schedule, caller, log, disableLogging, callback) {
|
|
10
|
+
if (!assert(log, caller, schedule, 'type')) {
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
switch (schedule.type) {
|
|
14
|
+
case ScheduleType.INTERVAL:
|
|
15
|
+
if (!assert(log, caller, schedule, 'interval', 'units')) {
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
break;
|
|
19
|
+
case ScheduleType.CRON:
|
|
20
|
+
if (!assert(log, caller, schedule, 'cron')) {
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
return new Schedule(schedule, caller, log, disableLogging, callback);
|
|
25
|
+
}
|
|
26
|
+
cronjob;
|
|
27
|
+
constructor(schedule, caller, log, disableLogging, callback) {
|
|
28
|
+
super(caller, log, disableLogging);
|
|
29
|
+
this.schedule = schedule;
|
|
30
|
+
this.callback = callback;
|
|
31
|
+
switch (this.schedule.type) {
|
|
32
|
+
case ScheduleType.INTERVAL:
|
|
33
|
+
this.startTimeout();
|
|
34
|
+
break;
|
|
35
|
+
case ScheduleType.CRON:
|
|
36
|
+
this.startCron();
|
|
37
|
+
break;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
get cancelString() {
|
|
41
|
+
throw new Error('Method not implemented.');
|
|
42
|
+
}
|
|
43
|
+
startTimeout() {
|
|
44
|
+
this.reset();
|
|
45
|
+
const logStrings = DelayLogStrings(strings.accessory.schedule.intervalMilliseconds, strings.accessory.schedule.intervalSeconds, strings.accessory.schedule.intervalMinutes, strings.accessory.schedule.intervalHours);
|
|
46
|
+
const delay = this.getDelay(this.schedule.interval, this.schedule.units, this.schedule.random, logStrings);
|
|
47
|
+
this.timeout = setTimeout(async () => {
|
|
48
|
+
this.reset();
|
|
49
|
+
await this.callback();
|
|
50
|
+
this.startTimeout();
|
|
51
|
+
}, delay);
|
|
52
|
+
}
|
|
53
|
+
startCron() {
|
|
54
|
+
const cron = this.schedule.cron;
|
|
55
|
+
if (!validateCronExpression(cron).valid) {
|
|
56
|
+
this.log.error(strings.accessory.invalidCron, this.caller, `'${this.schedule.cron}'`);
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
this.logIfDesired(strings.accessory.schedule.cron);
|
|
60
|
+
this.cronjob = new CronJob(this.schedule.cron, this.callback);
|
|
61
|
+
this.cronjob.start();
|
|
62
|
+
}
|
|
63
|
+
teardown() {
|
|
64
|
+
super.teardown();
|
|
65
|
+
this.cronjob?.stop();
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
//# sourceMappingURL=schedule.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schedule.js","sourceRoot":"","sources":["../../src/timeout/schedule.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { TimeUnits } from '../model/types.js';
|
|
2
|
+
import { Log } from '../tools/log.js';
|
|
3
|
+
type DelayLogStrings = {
|
|
4
|
+
milliseconds: string;
|
|
5
|
+
seconds: string;
|
|
6
|
+
minutes: string;
|
|
7
|
+
hours: string;
|
|
8
|
+
};
|
|
9
|
+
export declare function DelayLogStrings(milliseconds: string, seconds: string, minutes: string, hours: string): DelayLogStrings;
|
|
10
|
+
export declare abstract class Timeout {
|
|
11
|
+
protected readonly caller: string;
|
|
12
|
+
protected readonly log: Log;
|
|
13
|
+
private readonly disableLogging;
|
|
14
|
+
protected timeout?: NodeJS.Timeout;
|
|
15
|
+
protected constructor(caller: string, log: Log, disableLogging: boolean);
|
|
16
|
+
protected abstract get cancelString(): string;
|
|
17
|
+
cancel(): void;
|
|
18
|
+
teardown(): void;
|
|
19
|
+
protected reset(): void;
|
|
20
|
+
protected getDelay(rawTime: number, units: TimeUnits, random: boolean | undefined, strings: DelayLogStrings): number;
|
|
21
|
+
protected logIfDesired(message: string, ...parameters: (string | number)[]): void;
|
|
22
|
+
}
|
|
23
|
+
export {};
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import { TimeUnits } from '../model/types.js';
|
|
2
|
+
const SECOND = 1000;
|
|
3
|
+
const MINUTE = 60 * SECOND;
|
|
4
|
+
const HOUR = 60 * MINUTE;
|
|
5
|
+
export function DelayLogStrings(milliseconds, seconds, minutes, hours) {
|
|
6
|
+
return { milliseconds: milliseconds, seconds: seconds, minutes: minutes, hours: hours };
|
|
7
|
+
}
|
|
8
|
+
export class Timeout {
|
|
9
|
+
caller;
|
|
10
|
+
log;
|
|
11
|
+
disableLogging;
|
|
12
|
+
timeout;
|
|
13
|
+
constructor(caller, log, disableLogging) {
|
|
14
|
+
this.caller = caller;
|
|
15
|
+
this.log = log;
|
|
16
|
+
this.disableLogging = disableLogging;
|
|
17
|
+
}
|
|
18
|
+
cancel() {
|
|
19
|
+
if (this.timeout) {
|
|
20
|
+
this.logIfDesired(this.cancelString);
|
|
21
|
+
}
|
|
22
|
+
this.reset();
|
|
23
|
+
}
|
|
24
|
+
teardown() {
|
|
25
|
+
this.reset();
|
|
26
|
+
}
|
|
27
|
+
reset() {
|
|
28
|
+
clearTimeout(this.timeout);
|
|
29
|
+
this.timeout = undefined;
|
|
30
|
+
}
|
|
31
|
+
getDelay(rawTime, units, random, strings) {
|
|
32
|
+
let time;
|
|
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;
|
|
83
|
+
}
|
|
84
|
+
logIfDesired(message, ...parameters) {
|
|
85
|
+
if (this.disableLogging) {
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
this.log.always(message, this.caller, ...parameters);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
//# sourceMappingURL=timeout.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../src/timeout/timeout.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Timeout } from './timeout.js';
|
|
2
|
+
import { TimerConfig } from '../model/types.js';
|
|
3
|
+
import { Log } from '../tools/log.js';
|
|
4
|
+
export declare class Timer extends Timeout {
|
|
5
|
+
private readonly config;
|
|
6
|
+
static new(config: TimerConfig, caller: string, log: Log, disableLogging: boolean): Timer | undefined;
|
|
7
|
+
private constructor();
|
|
8
|
+
protected get cancelString(): string;
|
|
9
|
+
start(callback: () => Promise<void>): void;
|
|
10
|
+
}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { DelayLogStrings, Timeout } from './timeout.js';
|
|
2
|
+
import { strings } from '../i18n/i18n.js';
|
|
3
|
+
import { assert } from '../tools/validation.js';
|
|
4
|
+
export class Timer extends Timeout {
|
|
5
|
+
config;
|
|
6
|
+
static new(config, caller, log, disableLogging) {
|
|
7
|
+
if (!assert(log, caller, config, 'delay', 'units')) {
|
|
8
|
+
return undefined;
|
|
9
|
+
}
|
|
10
|
+
return new Timer(config, caller, log, disableLogging);
|
|
11
|
+
}
|
|
12
|
+
constructor(config, caller, log, disableLogging) {
|
|
13
|
+
super(caller, log, disableLogging);
|
|
14
|
+
this.config = config;
|
|
15
|
+
}
|
|
16
|
+
get cancelString() {
|
|
17
|
+
return strings.accessory.timer.cancel;
|
|
18
|
+
}
|
|
19
|
+
start(callback) {
|
|
20
|
+
this.cancel();
|
|
21
|
+
const logStrings = DelayLogStrings(strings.accessory.timer.setMilliseconds, strings.accessory.timer.setSeconds, strings.accessory.timer.setMinutes, strings.accessory.timer.setHours);
|
|
22
|
+
const delay = this.getDelay(this.config.delay, this.config.units, this.config.random, logStrings);
|
|
23
|
+
this.timeout = setTimeout(async () => {
|
|
24
|
+
this.reset();
|
|
25
|
+
await callback();
|
|
26
|
+
}, delay);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
//# sourceMappingURL=timer.js.map
|
|
@@ -0,0 +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;AAEhD,MAAM,OAAO,KAAM,SAAQ,OAAO;IAUb;IARnB,MAAM,CAAC,GAAG,CAAC,MAAmB,EAAE,MAAc,EAAE,GAAQ,EAAE,cAAuB;QAC/E,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;YACnD,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,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;IAED,IAAc,YAAY;QACxB,OAAO,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC;IACxC,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;CACF"}
|
|
@@ -20,8 +20,8 @@ function migrateAccessory(legacyConfig) {
|
|
|
20
20
|
}
|
|
21
21
|
if (!legacyConfig.stateful && legacyConfig.time) {
|
|
22
22
|
dummyConfig.timer = {
|
|
23
|
-
delay:
|
|
24
|
-
units: TimeUnits.
|
|
23
|
+
delay: legacyConfig.time,
|
|
24
|
+
units: TimeUnits.MILLISECONDS,
|
|
25
25
|
random: legacyConfig.random,
|
|
26
26
|
};
|
|
27
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configMigration.js","sourceRoot":"","sources":["../../src/tools/configMigration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAMpB,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAExE,OAAO,EAAyF,aAAa,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEpJ,SAAS,gBAAgB,CAAC,YAAmC;IAE3D,MAAM,WAAW,GAAgB;QAC/B,EAAE,EAAE,MAAM,CAAC,UAAU,EAAE;QACvB,IAAI,EAAE,YAAY,CAAC,IAAI;QACvB,IAAI,EAAE,aAAa,CAAC,MAAM;QAC1B,cAAc,EAAE,YAAY,CAAC,cAAc;KAC5C,CAAC;IAEF,IAAI,YAAY,CAAC,OAAO,EAAE,CAAC;QACzB,MAAM,WAAW,GAAG,WAA0B,CAAC;QAC/C,WAAW,CAAC,SAAS,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;QACxB,MAAM,eAAe,GAAG,WAA8B,CAAC;QACvD,eAAe,CAAC,IAAI,GAAG,aAAa,CAAC,SAAS,CAAC;QAC/C,eAAe,CAAC,iBAAiB,GAAG,YAAY,CAAC,UAAU,IAAI,CAAC,CAAC;IACnE,CAAC;IAED,IAAI,CAAC,YAAY,CAAC,QAAQ,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;QAChD,WAAW,CAAC,KAAK,GAAG;YAClB,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"configMigration.js","sourceRoot":"","sources":["../../src/tools/configMigration.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/storage.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export declare const STORAGE_KEY_SUFFIX_DEFAULT_STATE = "DefaultState";
|
|
2
2
|
export declare const STORAGE_KEY_SUFFIX_DEFAULT_BRIGHTNESS = "Brightness";
|
|
3
|
+
export declare const STORAGE_KEY_SUFFIX_DEFAULT_TEMPERATURE = "Temperature";
|
|
3
4
|
export declare function storageGet(dir: string, key: string): Promise<any>;
|
|
4
5
|
export declare function storageSet(dir: string, key: string, value: any): Promise<void>;
|
package/dist/tools/storage.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
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
|
+
export const STORAGE_KEY_SUFFIX_DEFAULT_TEMPERATURE = 'Temperature';
|
|
4
5
|
async function init(dir) {
|
|
5
6
|
await storage.init({ dir: dir, forgiveParseErrors: true });
|
|
6
7
|
}
|
|
@@ -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;
|
|
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;AAEpE,KAAK,UAAU,IAAI,CAAC,GAAW;IAC7B,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;AAC7D,CAAC;AAED,8DAA8D;AAC9D,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,GAAW,EAAE,GAAW;IACvD,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC;QAChB,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,GAAW,EAAE,KAAU;IACnE,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC;QACP,UAAU;IACZ,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { TemperatureUnits } from '../model/types.js';
|
|
2
|
+
const fahrenheitToCelsius = (fahrenheit) => {
|
|
3
|
+
return Number(((fahrenheit - 32) * 5 / 9).toFixed(1));
|
|
4
|
+
};
|
|
5
|
+
const celsiusToFahrenheit = (celsius) => {
|
|
6
|
+
return Math.round((celsius * 9 / 5) + 32);
|
|
7
|
+
};
|
|
8
|
+
export const toCelsius = (temp, units) => {
|
|
9
|
+
return units === TemperatureUnits.FAHRENHEIT ? fahrenheitToCelsius(temp) : temp;
|
|
10
|
+
};
|
|
11
|
+
export const fromCelsius = (temp, units) => {
|
|
12
|
+
return units === TemperatureUnits.FAHRENHEIT ? celsiusToFahrenheit(temp) : temp;
|
|
13
|
+
};
|
|
14
|
+
//# sourceMappingURL=temperature.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"temperature.js","sourceRoot":"","sources":["../../src/tools/temperature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,MAAM,mBAAmB,GAAG,CAAC,UAAkB,EAAU,EAAE;IACzD,OAAO,MAAM,CAAC,CAAC,CAAC,UAAU,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACxD,CAAC,CAAC;AACF,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAU,EAAE;IACtD,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC5C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,KAAwB,EAAU,EAAE;IAC1E,OAAO,KAAK,KAAK,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAClF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,KAAwB,EAAU,EAAE;IAC5E,OAAO,KAAK,KAAK,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAClF,CAAC,CAAC"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
import { Log } from './log.js';
|
|
2
2
|
import { Assertable } from '../model/types.js';
|
|
3
|
+
import { CharacteristicValue } from 'homebridge';
|
|
3
4
|
export declare function assert(log: Log, caller: string, assertable: Assertable, ...keys: (keyof any)[]): boolean;
|
|
5
|
+
export declare function assertType(log: Log, caller: string, value: CharacteristicValue, type: string): boolean;
|
package/dist/tools/validation.js
CHANGED
|
@@ -10,4 +10,11 @@ export function assert(log, caller, assertable, ...keys) {
|
|
|
10
10
|
}
|
|
11
11
|
return valid;
|
|
12
12
|
}
|
|
13
|
+
export function assertType(log, caller, value, type) {
|
|
14
|
+
if (typeof value !== type) {
|
|
15
|
+
log.error(strings.accessory.badValueType, caller, type, typeof value);
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
18
|
+
return true;
|
|
19
|
+
}
|
|
13
20
|
//# sourceMappingURL=validation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/tools/validation.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/tools/validation.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAK1C,8DAA8D;AAC9D,MAAM,UAAU,MAAM,CAAC,GAAQ,EAAE,MAAc,EAAE,UAAsB,EAAE,GAAG,IAAmB;IAC7F,IAAI,KAAK,GAAG,IAAI,CAAC;IACjB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAK,UAAsC,CAAC,GAAa,CAAC,KAAK,SAAS,EAAE,CAAC;YACzE,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YAC5E,KAAK,GAAG,KAAK,CAAC;QAChB,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,GAAQ,EAAE,MAAc,EAAE,KAA0B,EAAE,IAAY;IAE3F,IAAI,OAAO,KAAK,KAAK,IAAI,EAAE,CAAC;QAC1B,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,KAAK,CAAC,CAAC;QACtE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,IAAI,CAAC;AACd,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": "Dummy
|
|
5
|
+
"description": "Dummy accessories for automation with scheduling, delays, sensors, commands, and more",
|
|
6
6
|
"type": "module",
|
|
7
|
-
"version": "1.1.0-beta.
|
|
7
|
+
"version": "1.1.0-beta.10",
|
|
8
8
|
"homepage": "https://github.com/mpatfield/homebridge-dummy#readme",
|
|
9
9
|
"repository": {
|
|
10
10
|
"type": "git",
|
|
@@ -31,7 +31,23 @@
|
|
|
31
31
|
"homebridge-dummy",
|
|
32
32
|
"hoobs",
|
|
33
33
|
"hoobs-plugin",
|
|
34
|
-
"homekit"
|
|
34
|
+
"homekit",
|
|
35
|
+
"dummy",
|
|
36
|
+
"automation",
|
|
37
|
+
"timer",
|
|
38
|
+
"delay",
|
|
39
|
+
"delay-switch",
|
|
40
|
+
"reset",
|
|
41
|
+
"schedule",
|
|
42
|
+
"command",
|
|
43
|
+
"cmd",
|
|
44
|
+
"cmdtrigger",
|
|
45
|
+
"http",
|
|
46
|
+
"sensor",
|
|
47
|
+
"motion",
|
|
48
|
+
"contact",
|
|
49
|
+
"leak",
|
|
50
|
+
"occupancy"
|
|
35
51
|
],
|
|
36
52
|
"engines": {
|
|
37
53
|
"homebridge": "^1.8.0 || ^2.0.0-beta.0",
|
|
@@ -39,6 +55,7 @@
|
|
|
39
55
|
},
|
|
40
56
|
"dependencies": {
|
|
41
57
|
"@homebridge/plugin-ui-utils": "^2.0.2",
|
|
58
|
+
"cron": "^4.3.2",
|
|
42
59
|
"homebridge-lib": "^7.1.4",
|
|
43
60
|
"lodash.merge": "^4.6.2",
|
|
44
61
|
"node-persist": "^4.0.4"
|
|
@@ -49,6 +66,7 @@
|
|
|
49
66
|
"esbuild": "^0.25.5",
|
|
50
67
|
"eslint": "^9.27.0",
|
|
51
68
|
"homebridge": "^2.0.0-beta.0",
|
|
69
|
+
"jiti": "^2.5.1",
|
|
52
70
|
"rimraf": "^6.0.1",
|
|
53
71
|
"ts-node": "^10.9.2",
|
|
54
72
|
"typescript-eslint": "^8.35.1"
|
package/dist/model/timer.d.ts
DELETED
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
import { Log } from '../tools/log.js';
|
|
2
|
-
import { TimerConfig } from './types.js';
|
|
3
|
-
export declare class Timer {
|
|
4
|
-
private readonly caller;
|
|
5
|
-
private readonly log?;
|
|
6
|
-
private timer;
|
|
7
|
-
constructor(caller: string, log?: Log | undefined);
|
|
8
|
-
start(config: TimerConfig, callback: () => Promise<void>): void;
|
|
9
|
-
cancel(): void;
|
|
10
|
-
teardown(): void;
|
|
11
|
-
private reset;
|
|
12
|
-
}
|
package/dist/model/timer.js
DELETED
|
@@ -1,62 +0,0 @@
|
|
|
1
|
-
import { strings } from '../i18n/i18n.js';
|
|
2
|
-
import { TimeUnits } from './types.js';
|
|
3
|
-
const SECOND = 1000;
|
|
4
|
-
const MINUTE = 60 * SECOND;
|
|
5
|
-
const HOUR = 60 * MINUTE;
|
|
6
|
-
export class Timer {
|
|
7
|
-
caller;
|
|
8
|
-
log;
|
|
9
|
-
timer = undefined;
|
|
10
|
-
constructor(caller, log) {
|
|
11
|
-
this.caller = caller;
|
|
12
|
-
this.log = log;
|
|
13
|
-
}
|
|
14
|
-
start(config, callback) {
|
|
15
|
-
if (this.timer) {
|
|
16
|
-
this.log?.always(strings.accessory.timer.reset, this.caller);
|
|
17
|
-
this.reset();
|
|
18
|
-
}
|
|
19
|
-
let delay = config.delay;
|
|
20
|
-
switch (config.units) {
|
|
21
|
-
case TimeUnits.SECONDS:
|
|
22
|
-
delay *= SECOND;
|
|
23
|
-
break;
|
|
24
|
-
case TimeUnits.MINUTES:
|
|
25
|
-
delay *= MINUTE;
|
|
26
|
-
break;
|
|
27
|
-
case TimeUnits.HOURS:
|
|
28
|
-
delay *= HOUR;
|
|
29
|
-
break;
|
|
30
|
-
}
|
|
31
|
-
if (config.random) {
|
|
32
|
-
delay = Math.floor(Math.max(SECOND, Math.random() * delay));
|
|
33
|
-
}
|
|
34
|
-
if (delay < MINUTE) {
|
|
35
|
-
this.log?.always(strings.accessory.timer.setSeconds, this.caller, Math.round(delay / SECOND));
|
|
36
|
-
}
|
|
37
|
-
else if (delay < HOUR) {
|
|
38
|
-
this.log?.always(strings.accessory.timer.setMinutes, this.caller, Math.round(delay / MINUTE));
|
|
39
|
-
}
|
|
40
|
-
else {
|
|
41
|
-
this.log?.always(strings.accessory.timer.setSeconds, this.caller, Math.round(delay / HOUR));
|
|
42
|
-
}
|
|
43
|
-
this.timer = setTimeout(async () => {
|
|
44
|
-
this.reset();
|
|
45
|
-
await callback();
|
|
46
|
-
}, delay);
|
|
47
|
-
}
|
|
48
|
-
cancel() {
|
|
49
|
-
if (this.timer) {
|
|
50
|
-
this.log?.always(strings.accessory.timer.cancel, this.caller);
|
|
51
|
-
this.reset();
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
teardown() {
|
|
55
|
-
this.reset();
|
|
56
|
-
}
|
|
57
|
-
reset() {
|
|
58
|
-
clearTimeout(this.timer);
|
|
59
|
-
this.timer = undefined;
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
//# sourceMappingURL=timer.js.map
|
package/dist/model/timer.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"timer.js","sourceRoot":"","sources":["../../src/model/timer.ts"],"names":[],"mappings":"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"}
|