homebridge-dummy 1.3.2 → 1.4.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 +12 -1
- package/README.md +34 -2
- package/config.schema.json +140 -28
- package/dist/accessory/base.d.ts +27 -8
- package/dist/accessory/base.js +46 -36
- package/dist/accessory/base.js.map +1 -1
- package/dist/accessory/group.d.ts +9 -1
- package/dist/accessory/group.js +14 -9
- package/dist/accessory/group.js.map +1 -1
- package/dist/accessory/helpers.d.ts +3 -5
- package/dist/accessory/helpers.js +12 -12
- package/dist/accessory/helpers.js.map +1 -1
- package/dist/accessory/lock.d.ts +6 -6
- package/dist/accessory/lock.js +14 -8
- package/dist/accessory/lock.js.map +1 -1
- package/dist/accessory/onoff/lightbulb.d.ts +4 -4
- package/dist/accessory/onoff/lightbulb.js +3 -3
- package/dist/accessory/onoff/lightbulb.js.map +1 -1
- package/dist/accessory/onoff/onoff.d.ts +7 -7
- package/dist/accessory/onoff/onoff.js +25 -13
- package/dist/accessory/onoff/onoff.js.map +1 -1
- package/dist/accessory/position/garage.d.ts +3 -4
- package/dist/accessory/position/garage.js +3 -3
- package/dist/accessory/position/garage.js.map +1 -1
- package/dist/accessory/position/position.d.ts +6 -6
- package/dist/accessory/position/position.js +14 -8
- package/dist/accessory/position/position.js.map +1 -1
- package/dist/accessory/sensor.d.ts +4 -5
- package/dist/accessory/sensor.js +14 -15
- package/dist/accessory/sensor.js.map +1 -1
- package/dist/accessory/thermostat.d.ts +5 -6
- package/dist/accessory/thermostat.js +17 -17
- package/dist/accessory/thermostat.js.map +1 -1
- package/dist/homebridge/platform.d.ts +1 -1
- package/dist/homebridge/platform.js +29 -12
- package/dist/homebridge/platform.js.map +1 -1
- package/dist/homebridge-ui/public/index.html +1 -1
- package/dist/homebridge-ui/public/ui.js +1 -1
- package/dist/i18n/de.d.ts +20 -0
- package/dist/i18n/en.d.ts +20 -0
- package/dist/i18n/en.js +20 -0
- package/dist/i18n/en.js.map +1 -1
- package/dist/i18n/es.d.ts +20 -0
- package/dist/i18n/i18n.d.ts +20 -0
- package/dist/i18n/ru.d.ts +20 -0
- package/dist/i18n/template.d.ts +20 -0
- package/dist/model/conditions.d.ts +14 -0
- package/dist/model/conditions.js +99 -0
- package/dist/model/conditions.js.map +1 -0
- package/dist/model/enums.d.ts +15 -4
- package/dist/model/enums.js +36 -12
- package/dist/model/enums.js.map +1 -1
- package/dist/model/types.d.ts +13 -3
- package/dist/timeout/limiter.d.ts +2 -2
- package/dist/timeout/limiter.js +8 -8
- package/dist/timeout/limiter.js.map +1 -1
- package/dist/timeout/schedule.d.ts +3 -3
- package/dist/timeout/schedule.js +18 -18
- package/dist/timeout/schedule.js.map +1 -1
- package/dist/timeout/timeout.d.ts +6 -4
- package/dist/timeout/timeout.js +12 -7
- package/dist/timeout/timeout.js.map +1 -1
- package/dist/timeout/timer.d.ts +2 -3
- package/dist/timeout/timer.js +7 -9
- package/dist/timeout/timer.js.map +1 -1
- package/dist/tools/configMigration.js +2 -2
- package/dist/tools/configMigration.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,10 +1,10 @@
|
|
|
1
|
+
import { DummyAddonDependency } from '../accessory/base.js';
|
|
1
2
|
import { Timeout } from './timeout.js';
|
|
2
3
|
import { ScheduleConfig } from '../model/types.js';
|
|
3
|
-
import { Log } from '../tools/log.js';
|
|
4
4
|
export declare class Schedule extends Timeout {
|
|
5
|
-
private readonly
|
|
5
|
+
private readonly config;
|
|
6
6
|
private readonly callback;
|
|
7
|
-
static new(
|
|
7
|
+
static new(dependency: DummyAddonDependency, config: ScheduleConfig | undefined, callback: () => Promise<void>): Schedule | undefined;
|
|
8
8
|
private cronjob?;
|
|
9
9
|
private constructor();
|
|
10
10
|
private startTimeout;
|
package/dist/timeout/schedule.js
CHANGED
|
@@ -5,42 +5,42 @@ import { isValidTimeUnits, printableValues, ScheduleType, TimeUnits } from '../m
|
|
|
5
5
|
import { assert } from '../tools/validation.js';
|
|
6
6
|
const CRON_CUSTOM = 'CRON_CUSTOM';
|
|
7
7
|
export class Schedule extends Timeout {
|
|
8
|
-
|
|
8
|
+
config;
|
|
9
9
|
callback;
|
|
10
|
-
static new(
|
|
11
|
-
if (!assert(log, caller,
|
|
10
|
+
static new(dependency, config, callback) {
|
|
11
|
+
if (config === undefined || !assert(dependency.log, dependency.caller, config, 'type')) {
|
|
12
12
|
return;
|
|
13
13
|
}
|
|
14
|
-
switch (
|
|
14
|
+
switch (config.type) {
|
|
15
15
|
case ScheduleType.INTERVAL:
|
|
16
|
-
if (!assert(log, caller,
|
|
16
|
+
if (!assert(dependency.log, dependency.caller, config, 'interval', 'units')) {
|
|
17
17
|
return;
|
|
18
18
|
}
|
|
19
|
-
if (!isValidTimeUnits(
|
|
20
|
-
log.error(strings.schedule.badUnits, caller, `'${
|
|
19
|
+
if (!isValidTimeUnits(config.units)) {
|
|
20
|
+
dependency.log.error(strings.schedule.badUnits, dependency.caller, `'${config.units}'`, printableValues(TimeUnits));
|
|
21
21
|
return;
|
|
22
22
|
}
|
|
23
23
|
break;
|
|
24
24
|
case ScheduleType.CRON:
|
|
25
|
-
if (!assert(log, caller,
|
|
25
|
+
if (!assert(dependency.log, dependency.caller, config, 'cron')) {
|
|
26
26
|
return;
|
|
27
27
|
}
|
|
28
|
-
if (
|
|
28
|
+
if (config.cron === CRON_CUSTOM && !assert(dependency.log, dependency.caller, config, 'cronCustom')) {
|
|
29
29
|
return;
|
|
30
30
|
}
|
|
31
31
|
break;
|
|
32
32
|
default:
|
|
33
|
-
log.error(strings.schedule.badType, caller, `'${
|
|
33
|
+
dependency.log.error(strings.schedule.badType, dependency.caller, `'${config.type}'`, printableValues(ScheduleType));
|
|
34
34
|
return;
|
|
35
35
|
}
|
|
36
|
-
return new Schedule(
|
|
36
|
+
return new Schedule(dependency, config, callback);
|
|
37
37
|
}
|
|
38
38
|
cronjob;
|
|
39
|
-
constructor(
|
|
40
|
-
super(
|
|
41
|
-
this.
|
|
39
|
+
constructor(dependency, config, callback) {
|
|
40
|
+
super(dependency);
|
|
41
|
+
this.config = config;
|
|
42
42
|
this.callback = callback;
|
|
43
|
-
switch (this.
|
|
43
|
+
switch (this.config.type) {
|
|
44
44
|
case ScheduleType.INTERVAL:
|
|
45
45
|
this.startTimeout();
|
|
46
46
|
break;
|
|
@@ -52,7 +52,7 @@ export class Schedule extends Timeout {
|
|
|
52
52
|
startTimeout() {
|
|
53
53
|
this.reset();
|
|
54
54
|
const logStrings = DelayLogStrings(strings.schedule.intervalMilliseconds, strings.schedule.intervalSeconds, strings.schedule.intervalMinutes, strings.schedule.intervalHours);
|
|
55
|
-
const delay = this.getDelay(this.
|
|
55
|
+
const delay = this.getDelay(this.config.interval, this.config.units, this.config.random, logStrings);
|
|
56
56
|
this.timeout = setTimeout(async () => {
|
|
57
57
|
this.reset();
|
|
58
58
|
await this.callback();
|
|
@@ -60,9 +60,9 @@ export class Schedule extends Timeout {
|
|
|
60
60
|
}, delay);
|
|
61
61
|
}
|
|
62
62
|
startCron() {
|
|
63
|
-
let cron = this.
|
|
63
|
+
let cron = this.config.cron;
|
|
64
64
|
if (cron === CRON_CUSTOM) {
|
|
65
|
-
cron = this.
|
|
65
|
+
cron = this.config.cronCustom;
|
|
66
66
|
}
|
|
67
67
|
if (!validateCronExpression(cron).valid) {
|
|
68
68
|
this.log.error(strings.accessory.invalidCron, this.caller, `'${cron}'`);
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"schedule.js","sourceRoot":"","sources":["../../src/timeout/schedule.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { DummyAddonDependency } from '../accessory/base.js';
|
|
1
2
|
import { TimeUnits } from '../model/enums.js';
|
|
2
3
|
import { Log } from '../tools/log.js';
|
|
3
4
|
export declare const SECOND = 1000;
|
|
@@ -13,13 +14,14 @@ type DelayLogStrings = {
|
|
|
13
14
|
export declare function DelayLogStrings(milliseconds: string, seconds: string, minutes: string, hours: string): DelayLogStrings;
|
|
14
15
|
export declare function getDelay(rawTime: number, units: TimeUnits, random?: boolean | undefined, logStrings?: DelayLogStrings | undefined, log?: Log | undefined, caller?: string | undefined): number;
|
|
15
16
|
export declare abstract class Timeout {
|
|
16
|
-
protected readonly
|
|
17
|
-
protected readonly log: Log;
|
|
18
|
-
private readonly disableLogging;
|
|
17
|
+
protected readonly dependency: DummyAddonDependency;
|
|
19
18
|
protected timeout?: NodeJS.Timeout;
|
|
20
|
-
protected constructor(
|
|
19
|
+
protected constructor(dependency: DummyAddonDependency);
|
|
21
20
|
cancel(): void;
|
|
22
21
|
teardown(): void;
|
|
22
|
+
protected get caller(): string;
|
|
23
|
+
protected get log(): Log;
|
|
24
|
+
private get disableLogging();
|
|
23
25
|
protected reset(): void;
|
|
24
26
|
protected getDelay(rawTime: number, units: TimeUnits, random?: boolean | undefined, logStrings?: DelayLogStrings | undefined): number;
|
|
25
27
|
protected logIfDesired(message: string, ...parameters: (string | number)[]): void;
|
package/dist/timeout/timeout.js
CHANGED
|
@@ -63,14 +63,10 @@ export function getDelay(rawTime, units, random = undefined, logStrings = undefi
|
|
|
63
63
|
return time;
|
|
64
64
|
}
|
|
65
65
|
export class Timeout {
|
|
66
|
-
|
|
67
|
-
log;
|
|
68
|
-
disableLogging;
|
|
66
|
+
dependency;
|
|
69
67
|
timeout;
|
|
70
|
-
constructor(
|
|
71
|
-
this.
|
|
72
|
-
this.log = log;
|
|
73
|
-
this.disableLogging = disableLogging;
|
|
68
|
+
constructor(dependency) {
|
|
69
|
+
this.dependency = dependency;
|
|
74
70
|
}
|
|
75
71
|
cancel() {
|
|
76
72
|
this.reset();
|
|
@@ -78,6 +74,15 @@ export class Timeout {
|
|
|
78
74
|
teardown() {
|
|
79
75
|
this.reset();
|
|
80
76
|
}
|
|
77
|
+
get caller() {
|
|
78
|
+
return this.dependency.caller;
|
|
79
|
+
}
|
|
80
|
+
get log() {
|
|
81
|
+
return this.dependency.log;
|
|
82
|
+
}
|
|
83
|
+
get disableLogging() {
|
|
84
|
+
return this.dependency.disableLogging;
|
|
85
|
+
}
|
|
81
86
|
reset() {
|
|
82
87
|
clearTimeout(this.timeout);
|
|
83
88
|
this.timeout = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../src/timeout/timeout.ts"],"names":[],"mappings":"
|
|
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
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import { Timeout } from './timeout.js';
|
|
2
|
+
import { DummyAddonDependency } from '../accessory/base.js';
|
|
2
3
|
import { TimerConfig } from '../model/types.js';
|
|
3
|
-
import { Log } from '../tools/log.js';
|
|
4
4
|
export declare class Timer extends Timeout {
|
|
5
5
|
private readonly config;
|
|
6
|
-
|
|
7
|
-
static new(config: TimerConfig, callerId: string, callerName: string, log: Log, disableLogging: boolean): Timer | undefined;
|
|
6
|
+
static new(dependency: DummyAddonDependency, config?: TimerConfig): Timer | undefined;
|
|
8
7
|
private expiresTimestamp?;
|
|
9
8
|
private constructor();
|
|
10
9
|
private get timerStorageKey();
|
package/dist/timeout/timer.js
CHANGED
|
@@ -5,26 +5,24 @@ import { Storage } from '../tools/storage.js';
|
|
|
5
5
|
import { assert } from '../tools/validation.js';
|
|
6
6
|
export class Timer extends Timeout {
|
|
7
7
|
config;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
if (!assert(log, callerName, config, 'delay', 'units')) {
|
|
8
|
+
static new(dependency, config) {
|
|
9
|
+
if (config === undefined || !assert(dependency.log, dependency.caller, config, 'delay', 'units')) {
|
|
11
10
|
return;
|
|
12
11
|
}
|
|
13
12
|
if (!isValidTimeUnits(config.units)) {
|
|
14
|
-
log.error(strings.timer.badUnits,
|
|
13
|
+
dependency.log.error(strings.timer.badUnits, dependency.caller, `'${config.units}'`, printableValues(TimeUnits));
|
|
15
14
|
return;
|
|
16
15
|
}
|
|
17
|
-
return new Timer(
|
|
16
|
+
return new Timer(dependency, config);
|
|
18
17
|
}
|
|
19
18
|
expiresTimestamp;
|
|
20
|
-
constructor(
|
|
21
|
-
super(
|
|
19
|
+
constructor(dependency, config) {
|
|
20
|
+
super(dependency);
|
|
22
21
|
this.config = config;
|
|
23
|
-
this.callerId = callerId;
|
|
24
22
|
this.expiresTimestamp = Storage.get(this.timerStorageKey);
|
|
25
23
|
}
|
|
26
24
|
get timerStorageKey() {
|
|
27
|
-
return `${this.
|
|
25
|
+
return `${this.dependency.identifier}:Timer`;
|
|
28
26
|
}
|
|
29
27
|
storeExpiresTimestamp(value) {
|
|
30
28
|
Storage.set(this.timerStorageKey, value);
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAIhE,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAGjF,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,MAAM,OAAO,KAAM,SAAQ,OAAO;IAkBuC;IAhBvE,MAAM,CAAC,GAAG,CAAC,UAAgC,EAAE,MAAoB;QAE/D,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;YACjG,OAAO;QACT,CAAC;QAED,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACpC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,UAAU,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,KAAK,GAAG,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC;YACjH,OAAO;QACT,CAAC;QAED,OAAO,IAAI,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACvC,CAAC;IAEO,gBAAgB,CAAU;IAElC,YAAoB,UAAgC,EAAmB,MAAmB;QACxF,KAAK,CAAC,UAAU,CAAC,CAAC;QADmD,WAAM,GAAN,MAAM,CAAa;QAGxF,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAW,CAAC;IACtE,CAAC;IAED,IAAY,eAAe;QACzB,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,QAAQ,CAAC;IAC/C,CAAC;IAEO,qBAAqB,CAAC,KAAyB;QACrD,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,qBAAqB,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC;QACjD,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,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;QACtC,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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import fs from 'fs';
|
|
2
2
|
import { strings } from '../i18n/i18n.js';
|
|
3
3
|
import { LEGACY_ALIAS, PLATFORM_NAME } from '../homebridge/settings.js';
|
|
4
|
-
import { AccessoryType, TimeUnits } from '../model/enums.js';
|
|
4
|
+
import { AccessoryType, OnState, TimeUnits } from '../model/enums.js';
|
|
5
5
|
function migrateAccessory(legacyConfig) {
|
|
6
6
|
const dummyConfig = {
|
|
7
7
|
id: crypto.randomUUID(),
|
|
@@ -11,7 +11,7 @@ function migrateAccessory(legacyConfig) {
|
|
|
11
11
|
};
|
|
12
12
|
if (legacyConfig.reverse) {
|
|
13
13
|
const onOffConfig = dummyConfig;
|
|
14
|
-
onOffConfig.
|
|
14
|
+
onOffConfig.defaultState = OnState.ON;
|
|
15
15
|
}
|
|
16
16
|
if (legacyConfig.dimmer) {
|
|
17
17
|
const lightbulbConfig = dummyConfig;
|
|
@@ -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,EAAE,aAAa,EAAE,SAAS,EAAE,MAAO,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"configMigration.js","sourceRoot":"","sources":["../../src/tools/configMigration.ts"],"names":[],"mappings":"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"}
|
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.
|
|
7
|
+
"version": "1.4.0-beta.0",
|
|
8
8
|
"homepage": "https://github.com/mpatfield/homebridge-dummy#readme",
|
|
9
9
|
"repository": {
|
|
10
10
|
"type": "git",
|