homebridge-dummy 1.3.0-beta.0 → 1.3.0-beta.2
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 +2 -2
- package/dist/accessory/base.js +5 -6
- package/dist/accessory/base.js.map +1 -1
- package/dist/accessory/lock.js +13 -8
- package/dist/accessory/lock.js.map +1 -1
- package/dist/accessory/onoff/lightbulb.d.ts +1 -1
- package/dist/accessory/onoff/lightbulb.js +21 -12
- package/dist/accessory/onoff/lightbulb.js.map +1 -1
- package/dist/accessory/onoff/onoff.js +11 -6
- package/dist/accessory/onoff/onoff.js.map +1 -1
- package/dist/accessory/position/position.js +13 -8
- package/dist/accessory/position/position.js.map +1 -1
- package/dist/accessory/thermostat.js +26 -19
- package/dist/accessory/thermostat.js.map +1 -1
- package/dist/homebridge/platform.js +2 -2
- package/dist/homebridge/platform.js.map +1 -1
- package/dist/homebridge-ui/public/index.html +1 -1
- package/dist/i18n/en.d.ts +87 -85
- package/dist/i18n/en.js +87 -85
- package/dist/i18n/en.js.map +1 -1
- package/dist/i18n/i18n.d.ts +88 -87
- package/dist/i18n/i18n.js +0 -6
- package/dist/i18n/i18n.js.map +1 -1
- package/dist/i18n/template.d.ts +89 -87
- package/dist/i18n/template.js +2 -2
- package/dist/i18n/template.js.map +1 -1
- package/dist/timeout/limiter.d.ts +2 -1
- package/dist/timeout/limiter.js +39 -29
- package/dist/timeout/limiter.js.map +1 -1
- package/dist/timeout/schedule.js +4 -4
- package/dist/timeout/schedule.js.map +1 -1
- package/dist/timeout/timer.d.ts +8 -1
- package/dist/timeout/timer.js +49 -12
- package/dist/timeout/timer.js.map +1 -1
- package/dist/tools/storage.d.ts +14 -7
- package/dist/tools/storage.js +40 -19
- package/dist/tools/storage.js.map +1 -1
- package/package.json +1 -1
- package/dist/i18n/zz.d.ts +0 -233
- package/dist/i18n/zz.js +0 -6
- package/dist/i18n/zz.js.map +0 -1
package/dist/timeout/limiter.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { DAY, getDelay, HOUR, MINUTE, SECOND, Timeout } from './timeout.js';
|
|
2
2
|
import { strings } from '../i18n/i18n.js';
|
|
3
3
|
import { isValidTimeUnits, printableValues, TimePeriod, TimeUnits } from '../model/enums.js';
|
|
4
|
-
import {
|
|
4
|
+
import { Storage } from '../tools/storage.js';
|
|
5
5
|
import { assert } from '../tools/validation.js';
|
|
6
6
|
export default class Limiter extends Timeout {
|
|
7
7
|
config;
|
|
@@ -10,7 +10,7 @@ export default class Limiter extends Timeout {
|
|
|
10
10
|
return;
|
|
11
11
|
}
|
|
12
12
|
if (!isValidTimeUnits(config.units)) {
|
|
13
|
-
log.error(strings.
|
|
13
|
+
log.error(strings.limiter.badUnits, caller, `'${config.units}'`, printableValues(TimeUnits));
|
|
14
14
|
return;
|
|
15
15
|
}
|
|
16
16
|
let periodLength;
|
|
@@ -28,34 +28,36 @@ export default class Limiter extends Timeout {
|
|
|
28
28
|
periodLength = 31 * DAY;
|
|
29
29
|
break;
|
|
30
30
|
default:
|
|
31
|
-
log.error(strings.
|
|
31
|
+
log.error(strings.limiter.badPeriod, caller, `'${config.period}'`, printableValues(TimePeriod));
|
|
32
32
|
return;
|
|
33
33
|
}
|
|
34
34
|
const delay = getDelay(config.limit, config.units);
|
|
35
35
|
if (delay > periodLength) {
|
|
36
|
-
log.error(strings.
|
|
36
|
+
log.error(strings.limiter.limitExceedsPeriod, caller);
|
|
37
37
|
return;
|
|
38
38
|
}
|
|
39
39
|
return new Limiter(config, caller, log, disableLogging);
|
|
40
40
|
}
|
|
41
|
-
limit = { timeRemaining: -1, resetTimestamp: -1 };
|
|
42
|
-
startedAtTimestamp;
|
|
41
|
+
limit = { timeRemaining: -1, resetTimestamp: -1, startTimestamp: undefined };
|
|
43
42
|
constructor(config, caller, log, disableLogging) {
|
|
44
43
|
super(caller, log, disableLogging);
|
|
45
44
|
this.config = config;
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
45
|
+
const cache = Storage.get(this.limitStorageKey);
|
|
46
|
+
if (cache === undefined) {
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
this.limit = cache;
|
|
50
|
+
if (this.limit.startTimestamp === undefined) {
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
const elapsedTime = Date.now() - this.limit.startTimestamp;
|
|
54
|
+
this.limit.timeRemaining = Math.max(0, this.limit.timeRemaining - elapsedTime);
|
|
52
55
|
}
|
|
53
56
|
get limitStorageKey() {
|
|
54
57
|
const identifier = this.config.id ?? this.caller;
|
|
55
|
-
return `${identifier}
|
|
58
|
+
return `${identifier}:Limit`;
|
|
56
59
|
}
|
|
57
60
|
start(callback) {
|
|
58
|
-
super.cancel();
|
|
59
61
|
if (Date.now() - this.limit.resetTimestamp >= 0 || this.limit.timeRemaining === -1) {
|
|
60
62
|
this.resetTimeRemaining();
|
|
61
63
|
this.resetPeriod();
|
|
@@ -66,25 +68,33 @@ export default class Limiter extends Timeout {
|
|
|
66
68
|
this.limit.timeRemaining += timeUntilPeriodReset;
|
|
67
69
|
}
|
|
68
70
|
if (this.limit.timeRemaining > 0) {
|
|
69
|
-
this.
|
|
71
|
+
this.logTimeRemaining();
|
|
72
|
+
this.limit.startTimestamp = Date.now();
|
|
73
|
+
this.storeLimit();
|
|
70
74
|
}
|
|
71
|
-
this.logTimeRemaining();
|
|
72
75
|
this.timeout = setTimeout(async () => {
|
|
73
76
|
this.reset();
|
|
74
77
|
await callback();
|
|
75
78
|
}, Math.max(this.limit.timeRemaining, 0.1 * SECOND));
|
|
76
|
-
|
|
79
|
+
}
|
|
80
|
+
cancel() {
|
|
81
|
+
if (!this.limit.startTimestamp) {
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
super.cancel();
|
|
77
85
|
}
|
|
78
86
|
reset() {
|
|
79
87
|
super.reset();
|
|
80
|
-
if (
|
|
81
|
-
|
|
88
|
+
if (this.limit.startTimestamp !== undefined) {
|
|
89
|
+
const elapsedTime = Date.now() - this.limit.startTimestamp;
|
|
90
|
+
this.limit.timeRemaining = Math.max(0, this.limit.timeRemaining - elapsedTime);
|
|
91
|
+
this.limit.startTimestamp = undefined;
|
|
92
|
+
this.storeLimit();
|
|
82
93
|
}
|
|
83
|
-
const elapsedTime = Date.now() - this.startedAtTimestamp;
|
|
84
|
-
this.limit.timeRemaining = Math.max(0, this.limit.timeRemaining - elapsedTime);
|
|
85
|
-
this.startedAtTimestamp = undefined;
|
|
86
94
|
this.logTimeRemaining();
|
|
87
|
-
|
|
95
|
+
}
|
|
96
|
+
teardown() {
|
|
97
|
+
super.reset();
|
|
88
98
|
}
|
|
89
99
|
resetTimeRemaining() {
|
|
90
100
|
this.limit.timeRemaining = this.getDelay(this.config.limit, this.config.units);
|
|
@@ -111,26 +121,26 @@ export default class Limiter extends Timeout {
|
|
|
111
121
|
this.limit.resetTimestamp = date.getTime();
|
|
112
122
|
}
|
|
113
123
|
storeLimit() {
|
|
114
|
-
|
|
124
|
+
Storage.set(this.limitStorageKey, this.limit);
|
|
115
125
|
}
|
|
116
126
|
logTimeRemaining() {
|
|
117
127
|
if (this.limit.timeRemaining < 0) {
|
|
118
128
|
return;
|
|
119
129
|
}
|
|
120
130
|
if (this.limit.timeRemaining === 0) {
|
|
121
|
-
this.logIfDesired(strings.
|
|
131
|
+
this.logIfDesired(strings.limiter.expired);
|
|
122
132
|
}
|
|
123
133
|
else if (this.limit.timeRemaining < MINUTE) {
|
|
124
|
-
this.logIfDesired(strings.
|
|
134
|
+
this.logIfDesired(strings.limiter.remainingSeconds, Math.round(this.limit.timeRemaining / SECOND));
|
|
125
135
|
}
|
|
126
136
|
else if (this.limit.timeRemaining < HOUR) {
|
|
127
|
-
this.logIfDesired(strings.
|
|
137
|
+
this.logIfDesired(strings.limiter.remainingMinutes, Math.round(this.limit.timeRemaining / MINUTE));
|
|
128
138
|
}
|
|
129
139
|
else if (this.limit.timeRemaining < DAY) {
|
|
130
|
-
this.logIfDesired(strings.
|
|
140
|
+
this.logIfDesired(strings.limiter.remainingHours, Math.round(this.limit.timeRemaining / HOUR));
|
|
131
141
|
}
|
|
132
142
|
else {
|
|
133
|
-
this.logIfDesired(strings.
|
|
143
|
+
this.logIfDesired(strings.limiter.remainingDayPlus);
|
|
134
144
|
}
|
|
135
145
|
}
|
|
136
146
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"limiter.js","sourceRoot":"","sources":["../../src/timeout/limiter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5E,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAI7F,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"limiter.js","sourceRoot":"","sources":["../../src/timeout/limiter.ts"],"names":[],"mappings":"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"}
|
package/dist/timeout/schedule.js
CHANGED
|
@@ -17,7 +17,7 @@ export class Schedule extends Timeout {
|
|
|
17
17
|
return;
|
|
18
18
|
}
|
|
19
19
|
if (!isValidTimeUnits(schedule.units)) {
|
|
20
|
-
log.error(strings.
|
|
20
|
+
log.error(strings.schedule.badUnits, caller, `'${schedule.units}'`, printableValues(TimeUnits));
|
|
21
21
|
return;
|
|
22
22
|
}
|
|
23
23
|
break;
|
|
@@ -30,7 +30,7 @@ export class Schedule extends Timeout {
|
|
|
30
30
|
}
|
|
31
31
|
break;
|
|
32
32
|
default:
|
|
33
|
-
log.error(strings.
|
|
33
|
+
log.error(strings.schedule.badType, caller, `'${schedule.type}'`, printableValues(ScheduleType));
|
|
34
34
|
return;
|
|
35
35
|
}
|
|
36
36
|
return new Schedule(schedule, caller, log, disableLogging, callback);
|
|
@@ -51,7 +51,7 @@ export class Schedule extends Timeout {
|
|
|
51
51
|
}
|
|
52
52
|
startTimeout() {
|
|
53
53
|
this.reset();
|
|
54
|
-
const logStrings = DelayLogStrings(strings.
|
|
54
|
+
const logStrings = DelayLogStrings(strings.schedule.intervalMilliseconds, strings.schedule.intervalSeconds, strings.schedule.intervalMinutes, strings.schedule.intervalHours);
|
|
55
55
|
const delay = this.getDelay(this.schedule.interval, this.schedule.units, this.schedule.random, logStrings);
|
|
56
56
|
this.timeout = setTimeout(async () => {
|
|
57
57
|
this.reset();
|
|
@@ -68,7 +68,7 @@ export class Schedule extends Timeout {
|
|
|
68
68
|
this.log.error(strings.accessory.invalidCron, this.caller, `'${cron}'`);
|
|
69
69
|
return;
|
|
70
70
|
}
|
|
71
|
-
this.logIfDesired(strings.
|
|
71
|
+
this.logIfDesired(strings.schedule.cron);
|
|
72
72
|
this.cronjob = new CronJob(cron, this.callback);
|
|
73
73
|
this.cronjob.start();
|
|
74
74
|
}
|
|
@@ -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,gBAAgB,EAAE,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,MAAO,mBAAmB,CAAC;AAIhG,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,MAAM,WAAW,GAAG,aAAa,CAAC;AAElC,MAAM,OAAO,QAAS,SAAQ,OAAO;IAwChB;IAIA;IA1CnB,MAAM,CAAC,GAAG,CAAC,QAAwB,EAAE,MAAc,EAAG,GAAQ,EAAE,cAAuB,EAAE,QAA8B;QAErH,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC;YAC3C,OAAO;QACT,CAAC;QAED,QAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;YACvB,KAAK,YAAY,CAAC,QAAQ;gBACxB,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,CAAC;oBACxD,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAM,CAAC,EAAE,CAAC;oBACvC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"schedule.js","sourceRoot":"","sources":["../../src/timeout/schedule.ts"],"names":[],"mappings":"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"}
|
package/dist/timeout/timer.d.ts
CHANGED
|
@@ -3,8 +3,15 @@ import { TimerConfig } from '../model/types.js';
|
|
|
3
3
|
import { Log } from '../tools/log.js';
|
|
4
4
|
export declare class Timer extends Timeout {
|
|
5
5
|
private readonly config;
|
|
6
|
-
|
|
6
|
+
private readonly callerId;
|
|
7
|
+
static new(config: TimerConfig, callerId: string, callerName: string, log: Log, disableLogging: boolean): Timer | undefined;
|
|
8
|
+
private _expiresTimestamp?;
|
|
7
9
|
private constructor();
|
|
10
|
+
private get timerStorageKey();
|
|
11
|
+
private get expiresTimestamp();
|
|
12
|
+
private set expiresTimestamp(value);
|
|
8
13
|
start(callback: () => Promise<void>): void;
|
|
14
|
+
reset(): void;
|
|
9
15
|
cancel(): void;
|
|
16
|
+
teardown(): void;
|
|
10
17
|
}
|
package/dist/timeout/timer.js
CHANGED
|
@@ -1,37 +1,74 @@
|
|
|
1
|
-
import { DelayLogStrings, Timeout } from './timeout.js';
|
|
1
|
+
import { DelayLogStrings, SECOND, Timeout } from './timeout.js';
|
|
2
|
+
import { isValidTimeUnits, printableValues, TimeUnits } from '../model/enums.js';
|
|
2
3
|
import { strings } from '../i18n/i18n.js';
|
|
4
|
+
import { Storage } from '../tools/storage.js';
|
|
3
5
|
import { assert } from '../tools/validation.js';
|
|
4
|
-
import { isValidTimeUnits, printableValues, TimeUnits } from '../model/enums.js';
|
|
5
6
|
export class Timer extends Timeout {
|
|
6
7
|
config;
|
|
7
|
-
|
|
8
|
-
|
|
8
|
+
callerId;
|
|
9
|
+
static new(config, callerId, callerName, log, disableLogging) {
|
|
10
|
+
if (!assert(log, callerName, config, 'delay', 'units')) {
|
|
9
11
|
return;
|
|
10
12
|
}
|
|
11
13
|
if (!isValidTimeUnits(config.units)) {
|
|
12
|
-
log.error(strings.
|
|
14
|
+
log.error(strings.timer.badUnits, callerName, `'${config.units}'`, printableValues(TimeUnits));
|
|
13
15
|
return;
|
|
14
16
|
}
|
|
15
|
-
return new Timer(config,
|
|
17
|
+
return new Timer(config, callerId, callerName, log, disableLogging);
|
|
16
18
|
}
|
|
17
|
-
|
|
18
|
-
|
|
19
|
+
_expiresTimestamp;
|
|
20
|
+
constructor(config, callerId, callerName, log, disableLogging) {
|
|
21
|
+
super(callerName, log, disableLogging);
|
|
19
22
|
this.config = config;
|
|
23
|
+
this.callerId = callerId;
|
|
24
|
+
this.expiresTimestamp = Storage.get(this.timerStorageKey);
|
|
25
|
+
}
|
|
26
|
+
get timerStorageKey() {
|
|
27
|
+
return `${this.callerId}:Timer`;
|
|
28
|
+
}
|
|
29
|
+
get expiresTimestamp() {
|
|
30
|
+
return this._expiresTimestamp;
|
|
31
|
+
}
|
|
32
|
+
set expiresTimestamp(value) {
|
|
33
|
+
this._expiresTimestamp = value;
|
|
34
|
+
Storage.set(this.timerStorageKey, value);
|
|
20
35
|
}
|
|
21
36
|
start(callback) {
|
|
22
|
-
|
|
23
|
-
const logStrings = DelayLogStrings(strings.
|
|
24
|
-
|
|
37
|
+
super.reset();
|
|
38
|
+
const logStrings = DelayLogStrings(strings.timer.setMilliseconds, strings.timer.setSeconds, strings.timer.setMinutes, strings.timer.setHours);
|
|
39
|
+
let delay;
|
|
40
|
+
if (this.expiresTimestamp !== undefined) {
|
|
41
|
+
const timeRemaining = this.expiresTimestamp - Date.now();
|
|
42
|
+
if (timeRemaining > 0) {
|
|
43
|
+
delay = timeRemaining;
|
|
44
|
+
this.logIfDesired(strings.timer.resume);
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
delay = 0.1 * SECOND;
|
|
48
|
+
this.logIfDesired(strings.timer.expired);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
delay = this.getDelay(this.config.delay, this.config.units, this.config.random, logStrings);
|
|
53
|
+
this.expiresTimestamp = Date.now() + delay;
|
|
54
|
+
}
|
|
25
55
|
this.timeout = setTimeout(async () => {
|
|
26
56
|
this.reset();
|
|
27
57
|
await callback();
|
|
28
58
|
}, delay);
|
|
29
59
|
}
|
|
60
|
+
reset() {
|
|
61
|
+
this.expiresTimestamp = undefined;
|
|
62
|
+
super.reset();
|
|
63
|
+
}
|
|
30
64
|
cancel() {
|
|
31
65
|
if (this.timeout) {
|
|
32
|
-
this.logIfDesired(strings.
|
|
66
|
+
this.logIfDesired(strings.timer.cancel);
|
|
33
67
|
}
|
|
34
68
|
super.cancel();
|
|
35
69
|
}
|
|
70
|
+
teardown() {
|
|
71
|
+
super.reset();
|
|
72
|
+
}
|
|
36
73
|
}
|
|
37
74
|
//# 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;
|
|
1
|
+
{"version":3,"file":"timer.js","sourceRoot":"","sources":["../../src/timeout/timer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEhE,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAGjF,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAG1C,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,MAAM,OAAO,KAAM,SAAQ,OAAO;IAmBb;IACA;IAlBnB,MAAM,CAAC,GAAG,CAAC,MAAmB,EAAE,QAAgB,EAAE,UAAkB,EAAE,GAAQ,EAAE,cAAuB;QAErG,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;YACvD,OAAO;QACT,CAAC;QAED,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACpC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,MAAM,CAAC,KAAK,GAAG,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC;YAC/F,OAAO;QACT,CAAC;QAED,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,EAAE,cAAc,CAAC,CAAC;IACtE,CAAC;IAEO,iBAAiB,CAAU;IAEnC,YACmB,MAAmB,EACnB,QAAgB,EACjC,UAAkB,EAClB,GAAQ,EACR,cAAuB;QAEvB,KAAK,CAAC,UAAU,EAAE,GAAG,EAAE,cAAc,CAAC,CAAC;QANtB,WAAM,GAAN,MAAM,CAAa;QACnB,aAAQ,GAAR,QAAQ,CAAQ;QAOjC,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAW,CAAC;IACtE,CAAC;IAED,IAAY,eAAe;QACzB,OAAO,GAAG,IAAI,CAAC,QAAQ,QAAQ,CAAC;IAClC,CAAC;IAED,IAAY,gBAAgB;QAC1B,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED,IAAY,gBAAgB,CAAC,KAAyB;QACpD,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAC/B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;IAC3C,CAAC;IAEM,KAAK,CAAC,QAA8B;QAEzC,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,MAAM,UAAU,GAAG,eAAe,CAChC,OAAO,CAAC,KAAK,CAAC,eAAe,EAC7B,OAAO,CAAC,KAAK,CAAC,UAAU,EACxB,OAAO,CAAC,KAAK,CAAC,UAAU,EACxB,OAAO,CAAC,KAAK,CAAC,QAAQ,CACvB,CAAC;QAEF,IAAI,KAAa,CAAC;QAClB,IAAI,IAAI,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;YAExC,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACzD,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;gBACtB,KAAK,GAAG,aAAa,CAAC;gBACtB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC1C,CAAC;iBAAM,CAAC;gBACN,KAAK,GAAG,GAAG,GAAG,MAAM,CAAC;gBACrB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC3C,CAAC;QAEH,CAAC;aAAM,CAAC;YACN,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;YAC5F,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;QAC7C,CAAC;QAED,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,KAAK;QACZ,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAC;QAClC,KAAK,CAAC,KAAK,EAAE,CAAC;IAChB,CAAC;IAEQ,MAAM;QAEb,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC1C,CAAC;QAED,KAAK,CAAC,MAAM,EAAE,CAAC;IACjB,CAAC;IAEQ,QAAQ;QACf,KAAK,CAAC,KAAK,EAAE,CAAC;IAChB,CAAC;CACF"}
|
package/dist/tools/storage.d.ts
CHANGED
|
@@ -1,7 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
export declare function
|
|
7
|
-
export declare
|
|
1
|
+
import { PrimitiveTypes } from 'homebridge';
|
|
2
|
+
type Primative = string | number | boolean;
|
|
3
|
+
type Storable = Primative | Primative[] | {
|
|
4
|
+
[key: string]: PrimitiveTypes;
|
|
5
|
+
};
|
|
6
|
+
export declare function storageGet_Deprecated(key: string): Promise<Storable | undefined>;
|
|
7
|
+
export declare class Storage {
|
|
8
|
+
private static readonly bucket;
|
|
9
|
+
static init(persistPath: string): Promise<void>;
|
|
10
|
+
static has(key: string): boolean;
|
|
11
|
+
static get(key: string): Storable | undefined;
|
|
12
|
+
static set(key: string, storable: Storable | undefined): Promise<void>;
|
|
13
|
+
}
|
|
14
|
+
export {};
|
package/dist/tools/storage.js
CHANGED
|
@@ -1,27 +1,48 @@
|
|
|
1
1
|
import storage from 'node-persist';
|
|
2
|
-
|
|
3
|
-
export
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
2
|
+
const BUCKET_KEY = 'Storage.bucket';
|
|
3
|
+
export async function storageGet_Deprecated(key) {
|
|
4
|
+
if (!Storage.has(key)) {
|
|
5
|
+
const storable = await storage.get(key);
|
|
6
|
+
if (storable) {
|
|
7
|
+
await Storage.set(key, storable);
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
return Storage.get(key);
|
|
8
11
|
}
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
12
|
+
export class Storage {
|
|
13
|
+
static bucket = new Map();
|
|
14
|
+
static async init(persistPath) {
|
|
15
|
+
await storage.init({ dir: persistPath, forgiveParseErrors: true });
|
|
16
|
+
const bucketJson = await storage.get(BUCKET_KEY);
|
|
17
|
+
if (bucketJson === undefined) {
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
try {
|
|
21
|
+
const bucketArray = JSON.parse(bucketJson);
|
|
22
|
+
for (const entry of bucketArray) {
|
|
23
|
+
Storage.bucket.set(entry[0], entry[1]);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
catch {
|
|
27
|
+
// ignore
|
|
28
|
+
}
|
|
13
29
|
}
|
|
14
|
-
|
|
15
|
-
|
|
30
|
+
static has(key) {
|
|
31
|
+
return Storage.bucket.has(key);
|
|
16
32
|
}
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
export async function storageSet(key, value) {
|
|
20
|
-
try {
|
|
21
|
-
storage.set(key, value);
|
|
33
|
+
static get(key) {
|
|
34
|
+
return Storage.bucket.get(key);
|
|
22
35
|
}
|
|
23
|
-
|
|
24
|
-
|
|
36
|
+
static async set(key, storable) {
|
|
37
|
+
if (storable !== undefined) {
|
|
38
|
+
Storage.bucket.set(key, storable);
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
Storage.bucket.delete(key);
|
|
42
|
+
}
|
|
43
|
+
const bucketArray = Array.from(Storage.bucket.entries());
|
|
44
|
+
const bucketJson = JSON.stringify(bucketArray);
|
|
45
|
+
await storage.set(BUCKET_KEY, bucketJson);
|
|
25
46
|
}
|
|
26
47
|
}
|
|
27
48
|
//# sourceMappingURL=storage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/tools/storage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/tools/storage.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,cAAc,CAAC;AAKnC,MAAM,UAAU,GAAG,gBAAgB,CAAC;AAEpC,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,GAAW;IAErD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAC1B,CAAC;AAED,MAAM,OAAO,OAAO;IAEV,MAAM,CAAU,MAAM,GAAG,IAAI,GAAG,EAAoB,CAAC;IAEtD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,WAAmB;QAC1C,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;QAEnE,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACjD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAyB,CAAC;YACnE,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE,CAAC;gBAChC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACT,SAAS;QACT,CAAC;IACH,CAAC;IAEM,MAAM,CAAC,GAAG,CAAC,GAAW;QAC3B,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,GAAG,CAAC,GAAW;QAC3B,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,QAA8B;QACjE,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACpC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;QAED,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QACzD,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAC/C,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAC5C,CAAC"}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"displayName": "Homebridge Dummy",
|
|
5
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.3.0-beta.
|
|
7
|
+
"version": "1.3.0-beta.2",
|
|
8
8
|
"homepage": "https://github.com/mpatfield/homebridge-dummy#readme",
|
|
9
9
|
"repository": {
|
|
10
10
|
"type": "git",
|