homebridge-dummy 1.3.2 → 1.4.0-alpha.0

package/dist/i18n/i18n.d.ts

@@ -19,6 +19,20 @@ declare const translations: {
         error: string;
         executed: string;
     };
+    conditions: {
+        andMultipleLogs: string;
+        currentResult: string;
+        evaluatingConditions: string;
+        satisfied: string;
+        notSatisfied: string;
+        patternAndConditions: string;
+        patternMatch: string;
+        selfReference: string;
+        statesEqual: string;
+        statesNotEqual: string;
+        stateUnknown: string;
+        statesUnrelated: string;
+    };
     lightbulb: {
         brightness: string;
         stateOn: string;
@@ -38,7 +52,12 @@ declare const translations: {
         secured: string;
         unsecured: string;
     };
+    logWatcher: {
+        error: string;
+        missingFile: string;
+    };
     onOff: {
+        badDefault: string;
         stateOff: string;
         stateOn: string;
     };
@@ -81,6 +100,8 @@ declare const translations: {
         description: {
             commands: string;
             cron: string;
+            conditions: string;
+            fadeOut: string;
             limiter: string;
             random: string;
             schedule: string;
@@ -88,6 +109,7 @@ declare const translations: {
             timerControlled: string;
         };
         enumNames: {
+            accessory: string;
             auto: string;
             carbonDioxideSensor: string;
             carbonMonoxideSensor: string;
@@ -110,13 +132,17 @@ declare const translations: {
             leakSensor: string;
             lightbulb: string;
             lockMechanism: string;
+            log: string;
             minutely: string;
             month: string;
             monthly: string;
+            none: string;
             occupancySensor: string;
             off: string;
             on: string;
             open: string;
+            operatorAnd: string;
+            operatorOr: string;
             outlet: string;
             milliseconds: string;
             minutes: string;
@@ -150,6 +176,7 @@ declare const translations: {
         yes: string;
         title: {
             accessory: string;
+            accessoryState: string;
             commandClose: string;
             commandOff: string;
             commandOn: string;
@@ -158,6 +185,8 @@ declare const translations: {
             commands: string;
             commandTemperature: string;
             commandUnlock: string;
+            condition: string;
+            conditions: string;
             cron: string;
             cronCustom: string;
             defaultBrightness: string;
@@ -167,17 +196,23 @@ declare const translations: {
             delay: string;
             disableLogging: string;
             enableWebook: string;
+            fadeOut: string;
             groupName: string;
             interval: string;
             limit: string;
             limiter: string;
+            minimumTemperature: string;
+            maximumTemperature: string;
             name: string;
+            operator: string;
+            pattern: string;
             period: string;
             preset: string;
             random: string;
             resetOnRestart: string;
             schedule: string;
             sensor: string;
+            temperatureUnits: string;
             timer: string;
             timerControlled: string;
             type: string;

package/dist/i18n/ru.d.ts

@@ -8,6 +8,20 @@ declare const ru: {
         error: string;
         executed: string;
     };
+    conditions: {
+        andMultipleLogs: string;
+        currentResult: string;
+        evaluatingConditions: string;
+        satisfied: string;
+        notSatisfied: string;
+        patternAndConditions: string;
+        patternMatch: string;
+        selfReference: string;
+        statesEqual: string;
+        statesNotEqual: string;
+        stateUnknown: string;
+        statesUnrelated: string;
+    };
     lightbulb: {
         brightness: string;
         stateOn: string;
@@ -27,7 +41,12 @@ declare const ru: {
         secured: string;
         unsecured: string;
     };
+    logWatcher: {
+        error: string;
+        missingFile: string;
+    };
     onOff: {
+        badDefault: string;
         stateOff: string;
         stateOn: string;
     };
@@ -70,6 +89,8 @@ declare const ru: {
         description: {
             commands: string;
             cron: string;
+            conditions: string;
+            fadeOut: string;
             limiter: string;
             random: string;
             schedule: string;
@@ -77,6 +98,7 @@ declare const ru: {
             timerControlled: string;
         };
         enumNames: {
+            accessory: string;
             auto: string;
             carbonDioxideSensor: string;
             carbonMonoxideSensor: string;
@@ -99,13 +121,17 @@ declare const ru: {
             leakSensor: string;
             lightbulb: string;
             lockMechanism: string;
+            log: string;
             minutely: string;
             month: string;
             monthly: string;
+            none: string;
             occupancySensor: string;
             off: string;
             on: string;
             open: string;
+            operatorAnd: string;
+            operatorOr: string;
             outlet: string;
             milliseconds: string;
             minutes: string;
@@ -139,6 +165,7 @@ declare const ru: {
         yes: string;
         title: {
             accessory: string;
+            accessoryState: string;
             commandClose: string;
             commandOff: string;
             commandOn: string;
@@ -147,6 +174,8 @@ declare const ru: {
             commands: string;
             commandTemperature: string;
             commandUnlock: string;
+            condition: string;
+            conditions: string;
             cron: string;
             cronCustom: string;
             defaultBrightness: string;
@@ -156,17 +185,23 @@ declare const ru: {
             delay: string;
             disableLogging: string;
             enableWebook: string;
+            fadeOut: string;
             groupName: string;
             interval: string;
             limit: string;
             limiter: string;
+            minimumTemperature: string;
+            maximumTemperature: string;
             name: string;
+            operator: string;
+            pattern: string;
             period: string;
             preset: string;
             random: string;
             resetOnRestart: string;
             schedule: string;
             sensor: string;
+            temperatureUnits: string;
             timer: string;
             timerControlled: string;
             type: string;

package/dist/i18n/template.d.ts

@@ -8,6 +8,20 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
         error: string;
         executed: string;
     };
+    conditions: {
+        andMultipleLogs: string;
+        currentResult: string;
+        evaluatingConditions: string;
+        satisfied: string;
+        notSatisfied: string;
+        patternAndConditions: string;
+        patternMatch: string;
+        selfReference: string;
+        statesEqual: string;
+        statesNotEqual: string;
+        stateUnknown: string;
+        statesUnrelated: string;
+    };
     lightbulb: {
         brightness: string;
         stateOn: string;
@@ -27,7 +41,12 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
         secured: string;
         unsecured: string;
     };
+    logWatcher: {
+        error: string;
+        missingFile: string;
+    };
     onOff: {
+        badDefault: string;
         stateOff: string;
         stateOn: string;
     };
@@ -70,6 +89,8 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
         description: {
             commands: string;
             cron: string;
+            conditions: string;
+            fadeOut: string;
             limiter: string;
             random: string;
             schedule: string;
@@ -77,6 +98,7 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
             timerControlled: string;
         };
         enumNames: {
+            accessory: string;
             auto: string;
             carbonDioxideSensor: string;
             carbonMonoxideSensor: string;
@@ -99,13 +121,17 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
             leakSensor: string;
             lightbulb: string;
             lockMechanism: string;
+            log: string;
             minutely: string;
             month: string;
             monthly: string;
+            none: string;
             occupancySensor: string;
             off: string;
             on: string;
             open: string;
+            operatorAnd: string;
+            operatorOr: string;
             outlet: string;
             milliseconds: string;
             minutes: string;
@@ -139,6 +165,7 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
         yes: string;
         title: {
             accessory: string;
+            accessoryState: string;
             commandClose: string;
             commandOff: string;
             commandOn: string;
@@ -147,6 +174,8 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
             commands: string;
             commandTemperature: string;
             commandUnlock: string;
+            condition: string;
+            conditions: string;
             cron: string;
             cronCustom: string;
             defaultBrightness: string;
@@ -156,17 +185,23 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
             delay: string;
             disableLogging: string;
             enableWebook: string;
+            fadeOut: string;
             groupName: string;
             interval: string;
             limit: string;
             limiter: string;
+            minimumTemperature: string;
+            maximumTemperature: string;
             name: string;
+            operator: string;
+            pattern: string;
             period: string;
             preset: string;
             random: string;
             resetOnRestart: string;
             schedule: string;
             sensor: string;
+            temperatureUnits: string;
             timer: string;
             timerControlled: string;
             type: string;

package/dist/model/conditions.d.ts

@@ -0,0 +1,17 @@
+import { AccessoryState } from './enums.js';
+import { ConditionsConfig } from './types.js';
+import { Log } from '../tools/log.js';
+export declare class ConditionManager {
+    private readonly log;
+    private readonly targets;
+    private readonly triggersToTargets;
+    private readonly triggerStates;
+    private readonly logWatcher;
+    constructor(log: Log, storagePath: string);
+    teardown(): void;
+    register(name: string, identifier: string, conditions: ConditionsConfig | undefined, trigger: () => Promise<void>, reset: (() => Promise<void>) | undefined, disableLogging: boolean): void;
+    onStateChange(triggerId: string, state: AccessoryState): Promise<void>;
+    private onPatternMatch;
+    private evaluateConditions;
+    private compareStates;
+}

package/dist/model/conditions.js

@@ -0,0 +1,150 @@
+import { ConditionOperator, getStateType, OperandType } from './enums.js';
+import { strings } from '../i18n/i18n.js';
+import { LogWatcher } from '../tools/logWatcher.js';
+import { assert } from '../tools/validation.js';
+export class ConditionManager {
+    log;
+    targets = new Map();
+    triggersToTargets = new Map();
+    triggerStates = new Map();
+    logWatcher;
+    constructor(log, storagePath) {
+        this.log = log;
+        this.logWatcher = new LogWatcher(log, storagePath);
+    }
+    teardown() {
+        this.logWatcher.teardown();
+    }
+    register(name, identifier, conditions, trigger, reset, disableLogging) {
+        if (conditions === undefined) {
+            return;
+        }
+        if (!assert(this.log, name, conditions, 'operator', 'operands')) {
+            return;
+        }
+        let logTypeCount = 0;
+        let valid = true;
+        for (const operand of conditions.operands) {
+            valid = valid && assert(this.log, name, operand, 'type');
+            switch (operand.type) {
+                case OperandType.ACCESSORY:
+                    valid = valid && assert(this.log, name, operand, 'accessoryId', 'accessoryState');
+                    break;
+                case OperandType.LOG:
+                    logTypeCount++;
+                    valid = valid && assert(this.log, name, operand, 'pattern');
+                    break;
+            }
+            if (operand.accessoryId === identifier) {
+                this.log.error(strings.conditions.selfReference, name);
+                valid = false;
+                break;
+            }
+        }
+        if (logTypeCount > 1 && conditions.operator === ConditionOperator.AND) {
+            this.log.error(strings.conditions.andMultipleLogs, name);
+            return;
+        }
+        if (!valid) {
+            return;
+        }
+        const target = { name, identifier, conditions, trigger, reset, disableLogging };
+        this.targets.set(identifier, target);
+        for (const operand of conditions.operands) {
+            switch (operand.type) {
+                case OperandType.ACCESSORY: {
+                    const targetList = this.triggersToTargets.get(operand.accessoryId) ?? [];
+                    targetList.push(identifier);
+                    this.triggersToTargets.set(operand.accessoryId, targetList);
+                    break;
+                }
+                case OperandType.LOG:
+                    this.logWatcher.registerPattern(operand.pattern, () => this.onPatternMatch(target));
+                    break;
+            }
+        }
+    }
+    async onStateChange(triggerId, state) {
+        const targetIds = this.triggersToTargets.get(triggerId);
+        if (!targetIds) {
+            return;
+        }
+        this.triggerStates.set(triggerId, state);
+        for (const targetId of targetIds) {
+            const target = this.targets.get(targetId);
+            if (!target) {
+                throw new Error('Unable to find target associated with the supplied trigger');
+            }
+            this.log.ifVerbose(strings.conditions.evaluatingConditions, target.name);
+            if (this.evaluateConditions(target.conditions, false)) {
+                if (!target.disableLogging) {
+                    this.log.always(strings.conditions.satisfied, target.name);
+                }
+                await target.trigger();
+            }
+            else {
+                this.log.ifVerbose(strings.conditions.notSatisfied, target.name);
+                await target.reset?.();
+            }
+        }
+    }
+    onPatternMatch(target) {
+        if (target.conditions.operands.length === 1 || target.conditions.operator === ConditionOperator.OR) {
+            this.log.ifVerbose(strings.conditions.patternMatch, target.name);
+            target.trigger();
+            return;
+        }
+        this.log.ifVerbose(strings.conditions.patternAndConditions, target.name);
+        if (!this.evaluateConditions(target.conditions, true)) {
+            this.log.ifVerbose(strings.conditions.notSatisfied, target.name);
+            return;
+        }
+        if (!target.disableLogging) {
+            this.log.always(strings.conditions.satisfied, target.name);
+        }
+        target.trigger();
+    }
+    evaluateConditions(conditions, ignoreLogType) {
+        let result;
+        for (const operand of conditions.operands) {
+            if (operand.type === OperandType.LOG) {
+                if (ignoreLogType || conditions.operator === ConditionOperator.OR) {
+                    continue;
+                }
+                result = false;
+                break;
+            }
+            const currentState = this.triggerStates.get(operand.accessoryId);
+            if (!currentState) {
+                this.log.ifVerbose(strings.conditions.stateUnknown, `'${operand.accessoryId}'`);
+                result = false;
+                break;
+            }
+            const operandResult = this.compareStates(currentState, operand.accessoryState);
+            switch (conditions.operator) {
+                case ConditionOperator.AND:
+                    result = result === undefined ? operandResult : result && operandResult;
+                    break;
+                case ConditionOperator.OR:
+                    result = result === undefined ? operandResult : result || operandResult;
+                    break;
+            }
+            this.log.ifVerbose(strings.conditions.currentResult, `'${String(result)}'`);
+        }
+        return result ?? true;
+    }
+    compareStates(current, desired) {
+        if (current === desired) {
+            this.log.ifVerbose(strings.conditions.statesEqual, `'${current}'`);
+            return true;
+        }
+        const stateType = getStateType(current);
+        if (stateType && !Object.values(stateType).includes(desired)) {
+            this.log.error(strings.conditions.statesUnrelated, `'${current}'`, `'${desired}'`);
+            return false;
+        }
+        this.log.ifVerbose(strings.conditions.statesNotEqual, `'${current}'`, `'${desired}'`);
+        return false;
+    }
+}
+//# sourceMappingURL=conditions.js.map

package/dist/model/conditions.js.map

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

package/dist/model/enums.d.ts

@@ -28,16 +28,31 @@ export declare enum SensorCharacteristic {
     OccupancyDetected = "OccupancyDetected",
     SmokeDetected = "SmokeDetected"
 }
-export declare enum DefaultLockState {
+export declare enum ConditionOperator {
+    AND = "and",
+    OR = "or"
+}
+export declare enum OperandType {
+    ACCESSORY = "ACCESSORY",
+    LOG = "LOG"
+}
+export declare enum OnState {
+    ON = "on",
+    OFF = "off"
+}
+export declare function isValidOnState(input?: OnState): boolean;
+export declare enum LockState {
     LOCKED = "locked",
     UNLOCKED = "unlocked"
 }
-export declare function isValidLockState(input?: DefaultLockState): boolean;
-export declare enum DefaultPosition {
+export declare function isValidLockState(input?: LockState): boolean;
+export declare enum Position {
     OPEN = "open",
     CLOSED = "closed"
 }
-export declare function isValidPosition(input?: DefaultPosition): boolean;
+export declare function isValidPosition(input?: Position): boolean;
+export type AccessoryState = OnState | Position | LockState;
+export declare function getStateType(input: AccessoryState): typeof OnState | typeof LockState | typeof Position | undefined;
 export declare enum DefaultThermostatState {
     AUTO = "auto",
     COOL = "cool",

package/dist/model/enums.js

@@ -33,21 +33,50 @@ export var SensorCharacteristic;
     SensorCharacteristic["OccupancyDetected"] = "OccupancyDetected";
     SensorCharacteristic["SmokeDetected"] = "SmokeDetected";
 })(SensorCharacteristic || (SensorCharacteristic = {}));
-export var DefaultLockState;
-(function (DefaultLockState) {
-    DefaultLockState["LOCKED"] = "locked";
-    DefaultLockState["UNLOCKED"] = "unlocked";
-})(DefaultLockState || (DefaultLockState = {}));
+export var ConditionOperator;
+(function (ConditionOperator) {
+    ConditionOperator["AND"] = "and";
+    ConditionOperator["OR"] = "or";
+})(ConditionOperator || (ConditionOperator = {}));
+export var OperandType;
+(function (OperandType) {
+    OperandType["ACCESSORY"] = "ACCESSORY";
+    OperandType["LOG"] = "LOG";
+})(OperandType || (OperandType = {}));
+export var OnState;
+(function (OnState) {
+    OnState["ON"] = "on";
+    OnState["OFF"] = "off";
+})(OnState || (OnState = {}));
+export function isValidOnState(input) {
+    return input === undefined || Object.values(OnState).includes(input);
+}
+export var LockState;
+(function (LockState) {
+    LockState["LOCKED"] = "locked";
+    LockState["UNLOCKED"] = "unlocked";
+})(LockState || (LockState = {}));
 export function isValidLockState(input) {
-    return input === undefined || Object.values(DefaultLockState).includes(input);
+    return input === undefined || Object.values(LockState).includes(input);
 }
-export var DefaultPosition;
-(function (DefaultPosition) {
-    DefaultPosition["OPEN"] = "open";
-    DefaultPosition["CLOSED"] = "closed";
-})(DefaultPosition || (DefaultPosition = {}));
+export var Position;
+(function (Position) {
+    Position["OPEN"] = "open";
+    Position["CLOSED"] = "closed";
+})(Position || (Position = {}));
 export function isValidPosition(input) {
-    return input === undefined || Object.values(DefaultPosition).includes(input);
+    return input === undefined || Object.values(Position).includes(input);
+}
+export function getStateType(input) {
+    if (isValidOnState(input)) {
+        return OnState;
+    }
+    if (isValidPosition(input)) {
+        return Position;
+    }
+    if (isValidLockState(input)) {
+        return LockState;
+    }
 }
 export var DefaultThermostatState;
 (function (DefaultThermostatState) {

package/dist/model/enums.js.map

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