homebridge-dummy 1.3.0-beta.0 → 1.3.0-beta.1

package/dist/timeout/limiter.js

@@ -1,7 +1,7 @@
 import { DAY, getDelay, HOUR, MINUTE, SECOND, Timeout } from './timeout.js';
 import { strings } from '../i18n/i18n.js';
 import { isValidTimeUnits, printableValues, TimePeriod, TimeUnits } from '../model/enums.js';
-import { STORAGE_KEY_SUFFIX_LIMIT, storageGet, storageSet } from '../tools/storage.js';
+import { Storage } from '../tools/storage.js';
 import { assert } from '../tools/validation.js';
 export default class Limiter extends Timeout {
     config;
@@ -10,7 +10,7 @@ export default class Limiter extends Timeout {
             return;
         }
         if (!isValidTimeUnits(config.units)) {
-            log.error(strings.accessory.limiter.badUnits, caller, `'${config.units}'`, printableValues(TimeUnits));
+            log.error(strings.limiter.badUnits, caller, `'${config.units}'`, printableValues(TimeUnits));
             return;
         }
         let periodLength;
@@ -28,34 +28,36 @@ export default class Limiter extends Timeout {
                 periodLength = 31 * DAY;
                 break;
             default:
-                log.error(strings.accessory.limiter.badPeriod, caller, `'${config.period}'`, printableValues(TimePeriod));
+                log.error(strings.limiter.badPeriod, caller, `'${config.period}'`, printableValues(TimePeriod));
                 return;
         }
         const delay = getDelay(config.limit, config.units);
         if (delay > periodLength) {
-            log.error(strings.accessory.limiter.limitExceedsPeriod, caller);
+            log.error(strings.limiter.limitExceedsPeriod, caller);
             return;
         }
         return new Limiter(config, caller, log, disableLogging);
     }
-    limit = { timeRemaining: -1, resetTimestamp: -1 };
-    startedAtTimestamp;
+    limit = { timeRemaining: -1, resetTimestamp: -1, startTimestamp: undefined };
     constructor(config, caller, log, disableLogging) {
         super(caller, log, disableLogging);
         this.config = config;
-        setTimeout(async () => {
-            const cache = await storageGet(this.limitStorageKey);
-            if (cache) {
-                this.limit = cache;
-            }
-        });
+        const cache = Storage.get(this.limitStorageKey);
+        if (cache === undefined) {
+            return;
+        }
+        this.limit = cache;
+        if (this.limit.startTimestamp === undefined) {
+            return;
+        }
+        const elapsedTime = Date.now() - this.limit.startTimestamp;
+        this.limit.timeRemaining = Math.max(0, this.limit.timeRemaining - elapsedTime);
     }
     get limitStorageKey() {
         const identifier = this.config.id ?? this.caller;
-        return `${identifier}:${STORAGE_KEY_SUFFIX_LIMIT}`;
+        return `${identifier}:Limit`;
     }
     start(callback) {
-        super.cancel();
         if (Date.now() - this.limit.resetTimestamp >= 0 || this.limit.timeRemaining === -1) {
             this.resetTimeRemaining();
             this.resetPeriod();
@@ -66,25 +68,33 @@ export default class Limiter extends Timeout {
             this.limit.timeRemaining += timeUntilPeriodReset;
         }
         if (this.limit.timeRemaining > 0) {
-            this.startedAtTimestamp = Date.now();
+            this.logTimeRemaining();
+            this.limit.startTimestamp = Date.now();
+            this.storeLimit();
         }
-        this.logTimeRemaining();
         this.timeout = setTimeout(async () => {
             this.reset();
             await callback();
         }, Math.max(this.limit.timeRemaining, 0.1 * SECOND));
-        this.storeLimit();
+    }
+    cancel() {
+        if (!this.limit.startTimestamp) {
+            return;
+        }
+        super.cancel();
     }
     reset() {
         super.reset();
-        if (!this.startedAtTimestamp) {
-            return;
+        if (this.limit.startTimestamp !== undefined) {
+            const elapsedTime = Date.now() - this.limit.startTimestamp;
+            this.limit.timeRemaining = Math.max(0, this.limit.timeRemaining - elapsedTime);
+            this.limit.startTimestamp = undefined;
+            this.storeLimit();
         }
-        const elapsedTime = Date.now() - this.startedAtTimestamp;
-        this.limit.timeRemaining = Math.max(0, this.limit.timeRemaining - elapsedTime);
-        this.startedAtTimestamp = undefined;
         this.logTimeRemaining();
-        this.storeLimit();
+    }
+    teardown() {
+        super.reset();
     }
     resetTimeRemaining() {
         this.limit.timeRemaining = this.getDelay(this.config.limit, this.config.units);
@@ -111,26 +121,26 @@ export default class Limiter extends Timeout {
         this.limit.resetTimestamp = date.getTime();
     }
     storeLimit() {
-        storageSet(this.limitStorageKey, this.limit);
+        Storage.set(this.limitStorageKey, this.limit);
     }
     logTimeRemaining() {
         if (this.limit.timeRemaining < 0) {
             return;
         }
         if (this.limit.timeRemaining === 0) {
-            this.logIfDesired(strings.accessory.limiter.expired);
+            this.logIfDesired(strings.limiter.expired);
         }
         else if (this.limit.timeRemaining < MINUTE) {
-            this.logIfDesired(strings.accessory.limiter.remainingSeconds, this.limit.timeRemaining / SECOND);
+            this.logIfDesired(strings.limiter.remainingSeconds, Math.round(this.limit.timeRemaining / SECOND));
         }
         else if (this.limit.timeRemaining < HOUR) {
-            this.logIfDesired(strings.accessory.limiter.remainingMinutes, this.limit.timeRemaining / MINUTE);
+            this.logIfDesired(strings.limiter.remainingMinutes, Math.round(this.limit.timeRemaining / MINUTE));
         }
         else if (this.limit.timeRemaining < DAY) {
-            this.logIfDesired(strings.accessory.limiter.remainingHours, this.limit.timeRemaining / HOUR);
+            this.logIfDesired(strings.limiter.remainingHours, Math.round(this.limit.timeRemaining / HOUR));
         }
         else {
-            this.logIfDesired(strings.accessory.limiter.remainingDayPlus);
+            this.logIfDesired(strings.limiter.remainingDayPlus);
         }
     }
 }

package/dist/timeout/limiter.js.map

@@ -1 +1 @@
-{"version":3,"file":"limiter.js","sourceRoot":"","sources":["../../src/timeout/limiter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"limiter.js","sourceRoot":"","sources":["../../src/timeout/limiter.ts"],"names":[],"mappings":"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"}

package/dist/timeout/schedule.js

@@ -17,7 +17,7 @@ export class Schedule extends Timeout {
                     return;
                 }
                 if (!isValidTimeUnits(schedule.units)) {
-                    log.error(strings.accessory.schedule.badUnits, caller, `'${schedule.units}'`, printableValues(TimeUnits));
+                    log.error(strings.schedule.badUnits, caller, `'${schedule.units}'`, printableValues(TimeUnits));
                     return;
                 }
                 break;
@@ -30,7 +30,7 @@ export class Schedule extends Timeout {
                 }
                 break;
             default:
-                log.error(strings.accessory.schedule.badType, caller, `'${schedule.type}'`, printableValues(ScheduleType));
+                log.error(strings.schedule.badType, caller, `'${schedule.type}'`, printableValues(ScheduleType));
                 return;
         }
         return new Schedule(schedule, caller, log, disableLogging, callback);
@@ -51,7 +51,7 @@ export class Schedule extends Timeout {
     }
     startTimeout() {
         this.reset();
-        const logStrings = DelayLogStrings(strings.accessory.schedule.intervalMilliseconds, strings.accessory.schedule.intervalSeconds, strings.accessory.schedule.intervalMinutes, strings.accessory.schedule.intervalHours);
+        const logStrings = DelayLogStrings(strings.schedule.intervalMilliseconds, strings.schedule.intervalSeconds, strings.schedule.intervalMinutes, strings.schedule.intervalHours);
         const delay = this.getDelay(this.schedule.interval, this.schedule.units, this.schedule.random, logStrings);
         this.timeout = setTimeout(async () => {
             this.reset();
@@ -68,7 +68,7 @@ export class Schedule extends Timeout {
             this.log.error(strings.accessory.invalidCron, this.caller, `'${cron}'`);
             return;
         }
-        this.logIfDesired(strings.accessory.schedule.cron);
+        this.logIfDesired(strings.schedule.cron);
         this.cronjob = new CronJob(cron, this.callback);
         this.cronjob.start();
     }

package/dist/timeout/schedule.js.map

@@ -1 +1 @@
-{"version":3,"file":"schedule.js","sourceRoot":"","sources":["../../src/timeout/schedule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schedule.js","sourceRoot":"","sources":["../../src/timeout/schedule.ts"],"names":[],"mappings":"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"}

package/dist/timeout/timer.js

@@ -9,7 +9,7 @@ export class Timer extends Timeout {
             return;
         }
         if (!isValidTimeUnits(config.units)) {
-            log.error(strings.accessory.timer.badUnits, caller, `'${config.units}'`, printableValues(TimeUnits));
+            log.error(strings.timer.badUnits, caller, `'${config.units}'`, printableValues(TimeUnits));
             return;
         }
         return new Timer(config, caller, log, disableLogging);
@@ -20,7 +20,7 @@ export class Timer extends Timeout {
     }
     start(callback) {
         this.cancel();
-        const logStrings = DelayLogStrings(strings.accessory.timer.setMilliseconds, strings.accessory.timer.setSeconds, strings.accessory.timer.setMinutes, strings.accessory.timer.setHours);
+        const logStrings = DelayLogStrings(strings.timer.setMilliseconds, strings.timer.setSeconds, strings.timer.setMinutes, strings.timer.setHours);
         const delay = this.getDelay(this.config.delay, this.config.units, this.config.random, logStrings);
         this.timeout = setTimeout(async () => {
             this.reset();
@@ -29,7 +29,7 @@ export class Timer extends Timeout {
     }
     cancel() {
         if (this.timeout) {
-            this.logIfDesired(strings.accessory.timer.cancel);
+            this.logIfDesired(strings.timer.cancel);
         }
         super.cancel();
     }

package/dist/timeout/timer.js.map

@@ -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;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"}
+{"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,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,MAAM,CAAC,KAAK,GAAG,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC;YAC3F,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,KAAK,CAAC,eAAe,EAC7B,OAAO,CAAC,KAAK,CAAC,UAAU,EACxB,OAAO,CAAC,KAAK,CAAC,UAAU,EACxB,OAAO,CAAC,KAAK,CAAC,QAAQ,CACvB,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,KAAK,CAAC,MAAM,CAAC,CAAC;QAC1C,CAAC;QAED,KAAK,CAAC,MAAM,EAAE,CAAC;IACjB,CAAC;CACF"}

package/dist/tools/storage.d.ts

@@ -1,7 +1,14 @@
-export declare const STORAGE_KEY_SUFFIX_DEFAULT_STATE = "DefaultState";
-export declare const STORAGE_KEY_SUFFIX_DEFAULT_BRIGHTNESS = "Brightness";
-export declare const STORAGE_KEY_SUFFIX_DEFAULT_TEMPERATURE = "Temperature";
-export declare const STORAGE_KEY_SUFFIX_LIMIT = "Limit";
-export declare function initStorage(persistPath: string): Promise<void>;
-export declare function storageGet(key: string): Promise<any>;
-export declare function storageSet(key: string, value: any): Promise<void>;
+import { PrimitiveTypes } from 'homebridge';
+type Primative = string | number | boolean;
+type Storable = Primative | Primative[] | {
+    [key: string]: PrimitiveTypes;
+};
+export declare function storageGet_Deprecated(key: string): Promise<Storable | undefined>;
+export declare class Storage {
+    private static readonly bucket;
+    static init(persistPath: string): Promise<void>;
+    static has(key: string): boolean;
+    static get(key: string): Storable | undefined;
+    static set(key: string, storable: Storable): Promise<void>;
+}
+export {};

package/dist/tools/storage.js

@@ -1,27 +1,43 @@
 import storage from 'node-persist';
-export const STORAGE_KEY_SUFFIX_DEFAULT_STATE = 'DefaultState';
-export const STORAGE_KEY_SUFFIX_DEFAULT_BRIGHTNESS = 'Brightness';
-export const STORAGE_KEY_SUFFIX_DEFAULT_TEMPERATURE = 'Temperature';
-export const STORAGE_KEY_SUFFIX_LIMIT = 'Limit';
-export async function initStorage(persistPath) {
-    await storage.init({ dir: persistPath, forgiveParseErrors: true });
+const BUCKET_KEY = 'Storage.bucket';
+export async function storageGet_Deprecated(key) {
+    if (!Storage.has(key)) {
+        const storable = await storage.get(key);
+        if (storable) {
+            await Storage.set(key, storable);
+        }
+    }
+    return Storage.get(key);
 }
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export async function storageGet(key) {
-    try {
-        return await storage.get(key);
+export class Storage {
+    static bucket = new Map();
+    static async init(persistPath) {
+        await storage.init({ dir: persistPath, forgiveParseErrors: true });
+        const bucketJson = await storage.get(BUCKET_KEY);
+        if (bucketJson === undefined) {
+            return;
+        }
+        try {
+            const bucketArray = JSON.parse(bucketJson);
+            for (const entry of bucketArray) {
+                Storage.bucket.set(entry[0], entry[1]);
+            }
+        }
+        catch {
+            // ignore
+        }
     }
-    catch (err) {
-        // Nothing
+    static has(key) {
+        return Storage.bucket.has(key);
     }
-}
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export async function storageSet(key, value) {
-    try {
-        storage.set(key, value);
+    static get(key) {
+        return Storage.bucket.get(key);
     }
-    catch {
-        // Nothing
+    static async set(key, storable) {
+        Storage.bucket.set(key, storable);
+        const bucketArray = Array.from(Storage.bucket.entries());
+        const bucketJson = JSON.stringify(bucketArray);
+        await storage.set(BUCKET_KEY, bucketJson);
     }
 }
 //# sourceMappingURL=storage.js.map

package/dist/tools/storage.js.map

@@ -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;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"}
+{"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,QAAkB;QACrD,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAElC,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

@@ -4,7 +4,7 @@
   "displayName": "Homebridge Dummy",
   "description": "Create Homebridge accessories to help with automation and control — scheduling, delays, sensors, commands, webhooks, and more",
   "type": "module",
-  "version": "1.3.0-beta.0",
+  "version": "1.3.0-beta.1",
   "homepage": "https://github.com/mpatfield/homebridge-dummy#readme",
   "repository": {
     "type": "git",

package/dist/i18n/zz.d.ts

@@ -1,233 +0,0 @@
-declare const zz: {
-    accessory: {
-        badValueType: string;
-        invalidCron: string;
-        missingRequired: string;
-        command: {
-            executed: string;
-            error: string;
-        };
-        lightbulb: {
-            brightness: string;
-            stateOn: string;
-        };
-        lock: {
-            badDefault: string;
-            secured: string;
-            unsecured: string;
-        };
-        onOff: {
-            stateOn: string;
-            stateOff: string;
-        };
-        position: {
-            badDefault: string;
-            closed: string;
-            open: string;
-        };
-        thermostat: {
-            auto: string;
-            badDefault: string;
-            badUnits: string;
-            cool: string;
-            heat: string;
-            off: string;
-            temperatureC: string;
-            temperatureF: string;
-            unsupportedFunction: string;
-        };
-        limiter: {
-            badPeriod: string;
-            badUnits: string;
-            expired: string;
-            limitExceedsPeriod: string;
-            remainingDayPlus: string;
-            remainingHours: string;
-            remainingMinutes: string;
-            remainingSeconds: string;
-        };
-        timer: {
-            badUnits: string;
-            cancel: string;
-            setMilliseconds: string;
-            setSeconds: string;
-            setMinutes: string;
-            setHours: string;
-        };
-        schedule: {
-            badType: string;
-            badUnits: string;
-            cron: string;
-            intervalMilliseconds: string;
-            intervalSeconds: string;
-            intervalMinutes: string;
-            intervalHours: string;
-        };
-    };
-    config: {
-        migrate: string;
-        migrationDetails1: string;
-        migrationDetails2: string;
-        migrationDetails3: string;
-        migrationDetails4: string;
-        migrationDetails5: string;
-        migrationRestartTitle: string;
-        migrationRestartDescription: string;
-        support: string;
-        thankYou: string;
-        yes: string;
-        no: string;
-        description: {
-            commands: string;
-            cron: string;
-            limiter: string;
-            random: string;
-            timerControlled: string;
-            timer: string;
-            schedule: string;
-        };
-        enumNames: {
-            auto: string;
-            carbonDioxideSensor: string;
-            carbonMonoxideSensor: string;
-            celsius: string;
-            closed: string;
-            contactSensor: string;
-            cool: string;
-            cron: string;
-            custom: string;
-            daily: string;
-            day: string;
-            door: string;
-            fahrenheit: string;
-            heat: string;
-            hour: string;
-            hourly: string;
-            hours: string;
-            interval: string;
-            leakSensor: string;
-            lightbulb: string;
-            lockMechanism: string;
-            minutely: string;
-            month: string;
-            monthly: string;
-            off: string;
-            occupancySensor: string;
-            on: string;
-            open: string;
-            outlet: string;
-            milliseconds: string;
-            minutes: string;
-            motionSensor: string;
-            secondly: string;
-            seconds: string;
-            secured: string;
-            smokeSensor: string;
-            switch: string;
-            thermostat: string;
-            unsecured: string;
-            weekdays: string;
-            weekends: string;
-            week: string;
-            weekly: string;
-            window: string;
-            windowCovering: string;
-            yearly: string;
-        };
-        title: {
-            accessory: string;
-            commands: string;
-            commandClose: string;
-            commandOn: string;
-            commandOff: string;
-            commandOpen: string;
-            commandLock: string;
-            commandUnlock: string;
-            commandTemperature: string;
-            cron: string;
-            cronCustom: string;
-            defaultBrightness: string;
-            defaultPosition: string;
-            defaultState: string;
-            defaultTemperature: string;
-            delay: string;
-            disableLogging: string;
-            enableWebook: string;
-            groupName: string;
-            interval: string;
-            name: string;
-            limit: string;
-            limiter: string;
-            period: string;
-            preset: string;
-            resetOnRestart: string;
-            timer: string;
-            timerControlled: string;
-            schedule: string;
-            sensor: string;
-            type: string;
-            units: string;
-            random: string;
-        };
-    };
-    sensor: {
-        badType: string;
-        carbonDioxide: {
-            active: string;
-            inactive: string;
-        };
-        carbonMonoxide: {
-            active: string;
-            inactive: string;
-        };
-        contact: {
-            active: string;
-            inactive: string;
-        };
-        leak: {
-            active: string;
-            inactive: string;
-        };
-        motion: {
-            active: string;
-            inactive: string;
-        };
-        occupancy: {
-            active: string;
-            inactive: string;
-        };
-        smoke: {
-            active: string;
-            inactive: string;
-        };
-    };
-    startup: {
-        migrationBridge: string;
-        migrationComplete: string;
-        migrationNoAccessories: string;
-        migrationIgnore: string;
-        migrationFailed: string;
-        migrationRevert: string;
-        newAccessory: string;
-        removeAccessory: string;
-        restoringAccessory: string;
-        setupComplete: string;
-        unsupportedType: string;
-        welcome: string[];
-    };
-    webhook: {
-        badUnits: string;
-        missing: string;
-        received: string;
-        register: string;
-        started: string;
-        stopped: string;
-        stopping: string;
-        validRange: string;
-        validValues: string;
-        unregisteredCommand: string;
-        unsupportedCommand: string;
-        unregisteredId: string;
-    };
-};
-export default zz;

package/dist/i18n/zz.js

@@ -1,6 +0,0 @@
-import merge from 'lodash.merge';
-import en from './en.js';
-const overrides = {};
-const zz = merge({}, en, overrides);
-export default zz;
-//# sourceMappingURL=zz.js.map

package/dist/i18n/zz.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"zz.js","sourceRoot":"","sources":["../../src/i18n/zz.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,cAAc,CAAC;AAEjC,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,MAAM,SAAS,GAAG,EACjB,CAAC;AAEF,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;AAEpC,eAAe,EAAE,CAAC"}