iobroker.iot 4.0.3 → 4.1.2

package/{build-backend → build}/lib/AlexaSmartHomeV3/Controls/Control.js

@@ -37,33 +37,11 @@ class Control {
      * @param detectedControl - The detected control in terms of iobroker type detector.
      */
     constructor(detectedControl) {
-        this.initStates(detectedControl);
-        this._supported = this.initCapabilities();
-        this._enforced = this.initEnforcedCapabilities();
         this.log = new Logger_1.default(this);
         this.log.silly(`created instance`);
-    }
-    /**
-     * This function maps a passed on control to an array of objects. Each object contains an Alexa capability the control natively supports
-     * and at least one property. Every property is initialized with corresponding iobroker state ids and value converters from Alexa to iobroker types
-     * and vice versa.
-     *
-     * @returns Array of objects with natively supported Alexa capabilities and correspondingly configured instances of StateProxies
-     */
-    initCapabilities() {
-        return [];
-    }
-    /**
-     * This function maps a passed on control to an array of objects. Each object contains an Alexa capability the control can handle even
-     * though not natively supported (e.g., the light control can handle the Alexa BrightnessController directive by switching
-     * itself `ON` on brightness > 0 and `OFF` on brightness == 0)
-     * Every capability has at least one property with set up iobroker state ids and value converters from Alexa to iobroker types
-     * and vice versa.
-     *
-     * @returns Array of objects with natively supported Alexa capabilities and correspondingly configured instances of StateProxies
-     */
-    initEnforcedCapabilities() {
-        return [];
+        this.initStates(detectedControl);
+        this._supported = [];
+        this._enforced = [];
     }
     get allCapabilities() {
         return this.supported.concat(this.enforced);
@@ -207,7 +185,11 @@ class Control {
     }
     async getOrRetrieveCurrentValue(property) {
         if (property.currentValue === undefined) {
-            property.currentValue = await AdapterProvider_1.default.getState(property.getId);
+            const id = property.getId;
+            if (!id) {
+                throw new Error(`no ID defined for property "${property.propertyName}" of "${this.name}"`);
+            }
+            property.currentValue = await AdapterProvider_1.default.getState(id);
         }
         if (property.currentValue === undefined) {
             throw new Error(`unable to retrieve ${property.getId}`);
@@ -215,7 +197,6 @@ class Control {
         return property.currentValue;
     }
     async reportState() {
-        this.log.debug(`reporting state`);
         const propertiesToReport = [];
         for (const capability of this.supported) {
             for (const property of capability.properties) {
@@ -233,12 +214,15 @@ class Control {
                     propertiesToReport.push(toReport);
                 }
                 catch (error) {
-                    this.log.error(`failed reporting state for property ${property.propertyName} of ${this.name}`);
+                    this.log.error(`failed reporting state for property "${property.propertyName}" of "${this.name}"`);
+                    if (error.stack) {
+                        this.log.debug(`${error.stack}`);
+                    }
                     this.log.debug(`${error}`);
                 }
             }
         }
-        this.log.debug(`${JSON.stringify(propertiesToReport)}`);
+        this.log.debug(`reporting state: ${JSON.stringify(propertiesToReport)}`);
         return propertiesToReport;
     }
     toString() {

package/build/lib/AlexaSmartHomeV3/Controls/Control.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Control.js","sourceRoot":"","sources":["../../../../src/lib/AlexaSmartHomeV3/Controls/Control.ts"],"names":[],"mappings":"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","sourcesContent":["import AlexaResponse from '../Alexa/AlexaResponse';\nimport { firstLower, className, ensureValueInRange_0_100, denormalize_0_100, normalize_0_100 } from '../Helpers/Utils';\nimport Logger from '../Helpers/Logger';\nimport AdapterProvider from '../Helpers/AdapterProvider';\nimport type { ControlStateInitObject, Base as PropertiesBase } from '../Alexa/Properties/Base';\nimport PowerState from '../Alexa/Properties/PowerState';\nimport DetectionState from '../Alexa/Properties/DetectionState';\nimport type {\n    AlexaV3Category,\n    AlexaV3DirectiveValue,\n    AlexaV3ReportedState,\n    AlexaV3Request,\n    IotExternalDetectorState,\n    IotExternalPatternControl,\n} from '../types';\nimport type { Base as CapabilitiesBase } from '../Alexa/Capabilities/Base';\n\n/**\n * Represents the base functionality for a control in a smart device. A smart device has at least one control.\n * The specific functionality, natively supported capabilities, etc. are defined in derived classes.\n */\nexport default class Control {\n    static stateKeys = [\n        'SET',\n        'ACTUAL',\n        'ON_SET',\n        'ON_ACTUAL',\n        'POWER',\n        'MODE',\n        'HUE',\n        'DIMMER',\n        'BRIGHTNESS',\n        'SATURATION',\n        'TEMPERATURE',\n        'ON',\n        'MUTE',\n    ];\n    public readonly log: Logger;\n    protected _supported: CapabilitiesBase[];\n    protected _enforced: CapabilitiesBase[];\n    protected readonly _states: Record<string, IotExternalDetectorState | undefined> = {};\n\n    /**\n     * @param detectedControl - The detected control in terms of iobroker type detector.\n     */\n    constructor(detectedControl: IotExternalPatternControl) {\n        this.log = new Logger(this);\n        this.log.silly(`created instance`);\n\n        this.initStates(detectedControl);\n        this._supported = [];\n        this._enforced = [];\n    }\n\n    get allCapabilities(): CapabilitiesBase[] {\n        return this.supported.concat(this.enforced);\n    }\n\n    static get type(): string {\n        return firstLower(className(this.toString()));\n    }\n    /**\n     * Getter for Alexa categories\n     */\n    get categories(): AlexaV3Category[] {\n        return ['OTHER'];\n    }\n\n    get name(): string {\n        return `${this.constructor.name}`;\n    }\n    /**\n     * Getter for _supported\n     */\n    get supported(): CapabilitiesBase[] {\n        return this._supported;\n    }\n    /**\n     * Getter for _enforced\n     */\n    get enforced(): CapabilitiesBase[] {\n        return this._enforced;\n    }\n    /**\n     * This function returns whether the control natively supports the passed on Alexa directive.\n     *\n     * @param event The event containing the Alexa directive as it comes from AWS Alexa Service\n     * @returns True if the control natively supports the directive, false - otherwise\n     */\n    supports(event: AlexaV3Request): boolean {\n        return this.supported.find(capability => capability.matches(event)) !== undefined;\n    }\n    /**\n     * This function returns whether the control though doesn't natively support the passed on Alexa directive, but able to handle it.\n     *\n     * @param event The event containing the Alexa directive as it comes from AWS Alexa Service\n     * @returns True if the control can handle the directive, false - otherwise\n     */\n    canHandle(event: AlexaV3Request): boolean {\n        return this.enforced.find(capability => capability.matches(event)) !== undefined;\n    }\n    /**\n     * This function processes an Alexa directive. Usually the result of the processing is setting an iobroker state to some value\n     * as a reaction to an interaction with Alexa via voice, app, etc.\n     *\n     * @param event The event containing the Alexa directive as it comes from AWS Alexa Service\n     * @returns Object containing the response to be sent to Alexa Service\n     */\n    async handle(event: AlexaV3Request): Promise<AlexaResponse> {\n        this.log.debug(`handling Alexa event`);\n        this.log.silly(`${JSON.stringify(event)}`);\n\n        const property = this.allCapabilities\n            .flatMap(item => item.properties)\n            .find(property => property.matches(event));\n\n        if (property) {\n            let alexaValue: AlexaV3DirectiveValue;\n            try {\n                const setter = this.valueSetter(event);\n                alexaValue = await setter(event, property);\n            } catch (error) {\n                this.log.debug(`${error}`);\n                this.log.error(`failed handling Alexa event`);\n\n                // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors\n                return Promise.reject(AlexaResponse.endpointUnreachable(event.directive.header.messageId).get());\n            }\n\n            // even though the handler successfully processed the Alexa event,\n            // we return an error here for ENFORCED capabilities, to prevent\n            // reporting multiple successes for the same capability and\n            // running into a situation of returning a wrong value back to Alexa\n            if (this.enforced.find(capability => capability.matches(event))) {\n                // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors\n                return Promise.reject(\n                    AlexaResponse.directiveNotSupportedByControl(\n                        this.name,\n                        event?.directive?.header?.namespace,\n                        event?.directive?.header?.messageId,\n                        event?.directive?.header?.payloadVersion,\n                    ).get(),\n                );\n            }\n\n            const response = AlexaResponse.handled(\n                event,\n                property.propertyName,\n                property.reportValue(alexaValue),\n                property.instance,\n            );\n\n            // though the processed directive required to change a single value, the response must contain values of all \"relevant\" properties\n            // Please refer to this for details: https://developer.amazon.com/en-US/docs/alexa/device-apis/alexa-thermostatcontroller.html#settargettemperature-response-event\n\n            // TODO: add values of relevant properties to response\n\n            this.log.silly(`${JSON.stringify(response.get())}`);\n            return response.get();\n        }\n\n        const errorResponse = AlexaResponse.directiveNotSupportedByControl(\n            this.name,\n            event?.directive?.header?.namespace,\n            event?.directive?.header?.messageId,\n            event?.directive?.header?.payloadVersion,\n        );\n        this.log.silly(`${JSON.stringify(errorResponse.get())}`);\n        // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors\n        return Promise.reject(errorResponse.get());\n    }\n\n    valueSetter(\n        _event: AlexaV3Request,\n    ): (event: AlexaV3Request, property: PropertiesBase) => Promise<AlexaV3DirectiveValue> {\n        return this.setValue.bind(this);\n    }\n\n    async setValue(event: AlexaV3Request, property: PropertiesBase): Promise<AlexaV3DirectiveValue> {\n        // extract alexa value from event\n        const alexaValue = property.alexaDirectiveValue(event);\n\n        // convert alexa value to iobroker value\n        let value = property.value(alexaValue);\n\n        // if set, the device could support toggle\n        if (event.currentState) {\n            // console.error(`----------------------------------- command: ${value}, current value: ${JSON.stringify(event.currentState)}`);\n            const state = event.currentState.find(item => item.name === property.propertyName);\n            if (state && value === true) {\n                // it could support toggle.\n                // get current value\n                const current = property.value(state.value);\n                if (current === true) {\n                    // turn off\n                    value = false;\n                } else if (current !== false) {\n                    const currentValue = await this.getOrRetrieveCurrentValue(property);\n                    if (currentValue === true) {\n                        // turn off\n                        value = false;\n                    }\n                }\n            }\n        }\n\n        // set iobroker state\n        await this.setState(property, value!);\n\n        property.currentValue = value;\n        // return value as expected by Alexa\n        return property.alexaValue(value);\n    }\n\n    async adjustValue(event: AlexaV3Request, property: PropertiesBase): Promise<AlexaV3DirectiveValue> {\n        // extract Alexa delta value from event\n        const delta = property.alexaDirectiveValue(event);\n        // get current value\n        const currentValue = await this.getOrRetrieveCurrentValue(property);\n        // convert the current value to Alexa value\n        const valueToAdjust = property.alexaValue(currentValue);\n        // adjust Alexa value\n        const adjustedValue = ensureValueInRange_0_100(\n            parseFloat((valueToAdjust as string) || '0') + parseFloat((delta as string) || '0'),\n        );\n        // convert adjusted value to iobroker value\n        const value = property.value(adjustedValue);\n\n        // set iobroker state\n        await this.setState(property, value as ioBroker.StateValue);\n\n        return adjustedValue;\n    }\n\n    protected async getOrRetrieveCurrentValue(property: PropertiesBase): Promise<ioBroker.StateValue> {\n        if (property.currentValue === undefined) {\n            const id = property.getId;\n            if (!id) {\n                throw new Error(`no ID defined for property \"${property.propertyName}\" of \"${this.name}\"`);\n            }\n            property.currentValue = await AdapterProvider.getState(id);\n        }\n\n        if (property.currentValue === undefined) {\n            throw new Error(`unable to retrieve ${property.getId}`);\n        }\n\n        return property.currentValue;\n    }\n\n    async reportState(): Promise<AlexaV3ReportedState[]> {\n        const propertiesToReport: AlexaV3ReportedState[] = [];\n\n        for (const capability of this.supported) {\n            for (const property of capability.properties) {\n                try {\n                    await this.getOrRetrieveCurrentValue(property);\n\n                    const toReport: AlexaV3ReportedState = {\n                        namespace: capability.namespace,\n                        instance: property.instance,\n                        name: property.propertyName,\n                        value: property.reportValue(property.alexaValue(property.currentValue)),\n                    };\n\n                    if (!toReport.instance) {\n                        delete toReport.instance;\n                    }\n\n                    propertiesToReport.push(toReport);\n                } catch (error) {\n                    this.log.error(`failed reporting state for property \"${property.propertyName}\" of \"${this.name}\"`);\n                    if (error.stack) {\n                        this.log.debug(`${error.stack}`);\n                    }\n                    this.log.debug(`${error}`);\n                }\n            }\n        }\n\n        this.log.debug(`reporting state: ${JSON.stringify(propertiesToReport)}`);\n        return propertiesToReport;\n    }\n\n    toString(): string {\n        return `${this.constructor.name}`;\n    }\n\n    private initStates(ctrl: IotExternalPatternControl): void {\n        for (const stateKey of Control.stateKeys) {\n            this._states[stateKey] = ctrl.states.find(s => s.name === stateKey);\n        }\n    }\n\n    get states(): Record<string, IotExternalDetectorState | undefined> {\n        return this._states;\n    }\n\n    get statesMap(): Record<string, string> {\n        const map: Record<string, string> = {};\n        for (const stateKey of Control.stateKeys) {\n            map[stateKey.toLowerCase()] = stateKey;\n        }\n        return map;\n    }\n\n    async setState(property: PropertiesBase, value: ioBroker.StateValue): Promise<void> {\n        await AdapterProvider.setState(property.setId, value);\n        property.currentValue = value;\n    }\n\n    //-------------------------------------------------------\n    // standard property init objects\n    //\n\n    protected blankInitObject(): ControlStateInitObject {\n        // const states = this.initStates(ctrl);\n        const map = this.statesMap;\n        return {\n            setState: this.states[map.actual]!,\n            getState: this.states[map.actual]!,\n        };\n    }\n\n    protected powerStateInitObject(): ControlStateInitObject {\n        // const states = this.initStates(ctrl);\n        const map = this.statesMap;\n\n        return {\n            setState: this.states[map.set]!,\n            getState: this.states[map.actual]!,\n            alexaSetter: function (alexaValue) {\n                return alexaValue === PowerState.ON;\n            },\n            alexaGetter: function (value) {\n                return value ? PowerState.ON : PowerState.OFF;\n            },\n        };\n    }\n\n    protected detectedStateInitObject(): ControlStateInitObject {\n        const map = this.statesMap;\n        return {\n            setState: this.states[map.actual]!,\n            getState: this.states[map.actual]!,\n            alexaSetter: function (_alexaValue: AlexaV3DirectiveValue): ioBroker.StateValue | undefined {\n                // should be never called\n                return 0;\n            },\n            alexaGetter: function (value: ioBroker.StateValue | undefined): AlexaV3DirectiveValue {\n                return value ? DetectionState.DETECTED : DetectionState.NOT_DETECTED;\n            },\n        };\n    }\n\n    protected percentageInitObject(): ControlStateInitObject {\n        const map = this.statesMap;\n        // const range = configuredRangeOrDefault(this.states[map.set]);\n        return {\n            setState: this.states[map.set]!,\n            getState: this.states[map.actual]!,\n            alexaSetter: function (this: PropertiesBase, alexaValue: AlexaV3DirectiveValue): ioBroker.StateValue {\n                return (\n                    denormalize_0_100(\n                        alexaValue as number,\n                        this.valuesRangeMin as number,\n                        this.valuesRangeMax as number,\n                    ) || 0\n                );\n            },\n            alexaGetter: function (\n                this: PropertiesBase,\n                value: ioBroker.StateValue | undefined,\n            ): AlexaV3DirectiveValue {\n                return normalize_0_100(value as number, this.valuesRangeMin as number, this.valuesRangeMax as number);\n            },\n        };\n    }\n}\n"]}

package/{build-backend → build}/lib/AlexaSmartHomeV3/Controls/Ct.js

@@ -16,39 +16,33 @@ class Ct extends AdjustableControl_1.default {
     _colorTemperatureCapability;
     _powerControllerCapability;
     _powerState;
-    get categories() {
-        return ['LIGHT'];
-    }
-    adjustableProperties() {
-        return [ColorTemperatureInKelvin_1.default];
-    }
-    initCapabilities() {
+    constructor(detectedControl) {
+        super(detectedControl);
         const map = this.statesMap;
-        const result = [new Capabilities_1.default.ColorController()];
+        this._supported = [new Capabilities_1.default.ColorController(this.blankInitObject())];
         // if the state DIMMER or BRIGHTNESS configured
         if (this.states[map.dimmer] || this.states[map.brightness]) {
-            this._brightnessCapability = new Capabilities_1.default.BrightnessController();
+            this._brightnessCapability = new Capabilities_1.default.BrightnessController(this.composeInitObjectBrightness());
             this._brightness = this._brightnessCapability.brightness;
-            result.push(this._brightnessCapability);
+            this._supported.push(this._brightnessCapability);
         }
         // if the state TEMPERATURE configured
         if (this.states[map.temperature]) {
-            this._colorTemperatureCapability = new Capabilities_1.default.ColorTemperatureController();
-            result.push(this._colorTemperatureCapability);
+            this._colorTemperatureCapability = new Capabilities_1.default.ColorTemperatureController(this.composeInitObjectColorTemperature());
+            this._supported.push(this._colorTemperatureCapability);
         }
         // if the state ON, DIMMER or BRIGHTNESS configured
         if (this.states[map.on] || this._brightness) {
-            this._powerControllerCapability = new Capabilities_1.default.PowerController();
+            this._powerControllerCapability = new Capabilities_1.default.PowerController(this.composeInitObjectPowerState());
             this._powerState = this._powerControllerCapability.powerState;
-            result.push(this._powerControllerCapability);
+            this._supported.push(this._powerControllerCapability);
         }
-        for (const property of result.flatMap(item => item.properties)) {
-            const initObject = this.composeInitObject(property);
-            if (initObject) {
-                property.init(initObject);
-            }
-        }
-        return result;
+    }
+    get categories() {
+        return ['LIGHT'];
+    }
+    adjustableProperties() {
+        return [ColorTemperatureInKelvin_1.default];
     }
     async getOrRetrieveCurrentValue(property) {
         const map = this.statesMap;
@@ -123,59 +117,58 @@ class Ct extends AdjustableControl_1.default {
         await this.setState(property, value ?? 0);
         return value;
     }
-    composeInitObject(property) {
+    composeInitObjectPowerState() {
         const map = this.statesMap;
-        if (property.propertyName === PowerState_1.default.propertyName) {
-            return {
-                setState: this.states[map.on] || this.states[map.dimmer] || this.states[map.brightness],
-                getState: this.states[map.on] || this.states[map.dimmer] || this.states[map.brightness],
-                alexaSetter: function (alexaValue) {
-                    return alexaValue === PowerState_1.default.ON;
-                },
-                alexaGetter: function (value) {
-                    return value ? PowerState_1.default.ON : PowerState_1.default.OFF;
-                },
-            };
-        }
-        if (property.propertyName === Brightness_1.default.propertyName) {
-            return {
-                setState: this.states[map.dimmer] || this.states[map.brightness],
-                getState: this.states[map.dimmer] || this.states[map.brightness],
-                alexaSetter: function (alexaValue) {
-                    return ((0, Utils_1.denormalize_0_100)(alexaValue, this.valuesRangeMin, this.valuesRangeMax) ?? 0);
-                },
-                alexaGetter: function (value) {
-                    return (0, Utils_1.normalize_0_100)(value, this.valuesRangeMin, this.valuesRangeMax);
-                },
-            };
-        }
-        if (property.propertyName === ColorTemperatureInKelvin_1.default.propertyName) {
-            return {
-                setState: this.states[map.temperature],
-                getState: this.states[map.temperature],
-                alexaSetter: function (alexaValue) {
-                    if (alexaValue === 1) {
-                        // increase directive
-                        const closest = (0, Utils_1.closestFromList)(this.currentValue || this.colorTemperatureTable[0], this.colorTemperatureTable);
-                        let index = this.colorTemperatureTable.indexOf(closest) + 1;
-                        index =
-                            index >= this.colorTemperatureTable.length ? this.colorTemperatureTable.length - 1 : index;
-                        return this.colorTemperatureTable[index];
-                    }
-                    if (alexaValue === -1) {
-                        // decrease directive
-                        const closest = (0, Utils_1.closestFromList)(this.currentValue || this.colorTemperatureTable[0], this.colorTemperatureTable);
-                        let index = this.colorTemperatureTable.indexOf(closest) - 1;
-                        index = index < 0 ? 0 : index;
-                        return this.colorTemperatureTable[index];
-                    }
-                    return alexaValue;
-                },
-                alexaGetter: function (value) {
-                    return value;
-                },
-            };
-        }
+        return {
+            setState: this.states[map.on] || this.states[map.dimmer] || this.states[map.brightness],
+            getState: this.states[map.on] || this.states[map.dimmer] || this.states[map.brightness],
+            alexaSetter: function (alexaValue) {
+                return alexaValue === PowerState_1.default.ON;
+            },
+            alexaGetter: function (value) {
+                return value ? PowerState_1.default.ON : PowerState_1.default.OFF;
+            },
+        };
+    }
+    composeInitObjectBrightness() {
+        const map = this.statesMap;
+        return {
+            setState: this.states[map.dimmer] || this.states[map.brightness],
+            getState: this.states[map.dimmer] || this.states[map.brightness],
+            alexaSetter: function (alexaValue) {
+                return ((0, Utils_1.denormalize_0_100)(alexaValue, this.valuesRangeMin, this.valuesRangeMax) ?? 0);
+            },
+            alexaGetter: function (value) {
+                return (0, Utils_1.normalize_0_100)(value, this.valuesRangeMin, this.valuesRangeMax);
+            },
+        };
+    }
+    composeInitObjectColorTemperature() {
+        const map = this.statesMap;
+        return {
+            setState: this.states[map.temperature],
+            getState: this.states[map.temperature],
+            alexaSetter: function (alexaValue) {
+                if (alexaValue === 1) {
+                    // increase directive
+                    const closest = (0, Utils_1.closestFromList)(this.currentValue || this.colorTemperatureTable[0], this.colorTemperatureTable);
+                    let index = this.colorTemperatureTable.indexOf(closest) + 1;
+                    index = index >= this.colorTemperatureTable.length ? this.colorTemperatureTable.length - 1 : index;
+                    return this.colorTemperatureTable[index];
+                }
+                if (alexaValue === -1) {
+                    // decrease directive
+                    const closest = (0, Utils_1.closestFromList)(this.currentValue || this.colorTemperatureTable[0], this.colorTemperatureTable);
+                    let index = this.colorTemperatureTable.indexOf(closest) - 1;
+                    index = index < 0 ? 0 : index;
+                    return this.colorTemperatureTable[index];
+                }
+                return alexaValue;
+            },
+            alexaGetter: function (value) {
+                return value;
+            },
+        };
     }
 }
 exports.default = Ct;

package/build/lib/AlexaSmartHomeV3/Controls/Ct.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Ct.js","sourceRoot":"","sources":["../../../../src/lib/AlexaSmartHomeV3/Controls/Ct.ts"],"names":[],"mappings":"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","sourcesContent":["import Capabilities from '../Alexa/Capabilities';\nimport { configuredRangeOrDefault, denormalize_0_100, normalize_0_100, closestFromList } from '../Helpers/Utils';\nimport AdapterProvider from '../Helpers/AdapterProvider';\nimport AdjustableControl from './AdjustableControl';\nimport type { Base as PropertiesBase } from '../Alexa/Properties/Base';\nimport type BrightnessController from '../Alexa/Capabilities/BrightnessController';\nimport Brightness from '../Alexa/Properties/Brightness';\nimport ColorTemperatureInKelvin from '../Alexa/Properties/ColorTemperatureInKelvin';\nimport type ColorTemperatureController from '../Alexa/Capabilities/ColorTemperatureController';\nimport type PowerController from '../Alexa/Capabilities/PowerController';\nimport PowerState from '../Alexa/Properties/PowerState';\nimport type {\n    AlexaV3Category,\n    AlexaV3DirectiveValue,\n    AlexaV3Request,\n    IotExternalDetectorState,\n    IotExternalPatternControl,\n} from '../types';\n\nexport default class Ct extends AdjustableControl {\n    private readonly _brightnessCapability: BrightnessController | undefined;\n    private readonly _brightness: Brightness | undefined;\n    private readonly _colorTemperatureCapability: ColorTemperatureController | undefined;\n    private readonly _powerControllerCapability: PowerController | undefined;\n    private readonly _powerState: PowerState | undefined;\n\n    constructor(detectedControl: IotExternalPatternControl) {\n        super(detectedControl);\n\n        const map = this.statesMap;\n        this._supported = [new Capabilities.ColorController(this.blankInitObject())];\n\n        // if the state DIMMER or BRIGHTNESS configured\n        if (this.states[map.dimmer] || this.states[map.brightness]) {\n            this._brightnessCapability = new Capabilities.BrightnessController(this.composeInitObjectBrightness());\n            this._brightness = this._brightnessCapability.brightness;\n            this._supported.push(this._brightnessCapability);\n        }\n\n        // if the state TEMPERATURE configured\n        if (this.states[map.temperature]) {\n            this._colorTemperatureCapability = new Capabilities.ColorTemperatureController(\n                this.composeInitObjectColorTemperature(),\n            );\n            this._supported.push(this._colorTemperatureCapability);\n        }\n\n        // if the state ON, DIMMER or BRIGHTNESS configured\n        if (this.states[map.on] || this._brightness) {\n            this._powerControllerCapability = new Capabilities.PowerController(this.composeInitObjectPowerState());\n            this._powerState = this._powerControllerCapability.powerState;\n            this._supported.push(this._powerControllerCapability);\n        }\n    }\n\n    get categories(): AlexaV3Category[] {\n        return ['LIGHT'];\n    }\n\n    adjustableProperties(): (typeof PropertiesBase)[] {\n        return [ColorTemperatureInKelvin];\n    }\n\n    protected async getOrRetrieveCurrentValue(property: PropertiesBase): Promise<ioBroker.StateValue> {\n        const map = this.statesMap;\n\n        if (property.currentValue === undefined) {\n            property.currentValue = await AdapterProvider.getState(property.getId);\n            // convert the non-zero brightness to power = true\n            if (property.propertyName === PowerState.propertyName && !this.states[map.on]) {\n                property.currentValue = property.currentValue !== 0;\n            }\n        }\n\n        if (property.currentValue === undefined) {\n            throw new Error(`unable to retrieve ${property.getId}`);\n        }\n\n        return property.currentValue;\n    }\n\n    async setState(property: PropertiesBase, value: ioBroker.StateValue): Promise<void> {\n        const map = this.statesMap;\n\n        if (property.propertyName === PowerState.propertyName) {\n            if (this.states[map.on]) {\n                await AdapterProvider.setState(property.setId, value);\n                property.currentValue = value;\n            } else {\n                if (!this._brightness) {\n                    throw new Error('No brightness property configured');\n                }\n                if (!this._powerState) {\n                    throw new Error('No powerState property configured');\n                }\n\n                if (value) {\n                    // set brightness\n                    // set byOn to the configured value or range.max otherwise\n                    const range = configuredRangeOrDefault(this.states[map.dimmer] || this.states[map.brightness]!);\n                    const smartName = (this.states[map.dimmer] || this.states[map.brightness])?.smartName;\n                    let byOn: number | string | undefined | null;\n                    if (smartName && typeof smartName === 'object') {\n                        byOn = smartName.byON;\n                    } else {\n                        byOn = undefined;\n                    }\n                    if (byOn === undefined || byOn === null || isNaN(byOn as unknown as number)) {\n                        byOn = range.max as number | string | undefined | null;\n                    } else {\n                        byOn = parseFloat(byOn);\n                    }\n                    await AdapterProvider.setState(this._brightness.setId, byOn ?? 100);\n                    this._brightness.currentValue = byOn;\n                    this._powerState.currentValue = true;\n                } else {\n                    // set brightness to 0 on power OFF\n                    await AdapterProvider.setState(this._brightness.setId, 0);\n                    this._brightness.currentValue = 0;\n                    this._powerState.currentValue = false;\n                }\n            }\n        } else if (\n            property.propertyName === Brightness.propertyName ||\n            property.propertyName === ColorTemperatureInKelvin.propertyName\n        ) {\n            await AdapterProvider.setState(property.setId, value);\n            property.currentValue = value;\n        }\n    }\n\n    async adjustValue(event: AlexaV3Request, property: PropertiesBase): Promise<AlexaV3DirectiveValue> {\n        // extract Alexa delta value from event\n        const delta = property.alexaDirectiveValue(event);\n\n        // convert delta to iobroker value\n        const value = property.value(delta);\n\n        // set iobroker state\n        await this.setState(property, value ?? 0);\n\n        return value as AlexaV3DirectiveValue;\n    }\n\n    protected composeInitObjectPowerState(): {\n        setState: IotExternalDetectorState;\n        getState: IotExternalDetectorState;\n        alexaSetter?: (alexaValue: AlexaV3DirectiveValue) => ioBroker.StateValue | undefined;\n        alexaGetter?: (value: ioBroker.StateValue | undefined) => AlexaV3DirectiveValue;\n    } {\n        const map = this.statesMap;\n        return {\n            setState: this.states[map.on] || this.states[map.dimmer] || this.states[map.brightness]!,\n            getState: this.states[map.on] || this.states[map.dimmer] || this.states[map.brightness]!,\n            alexaSetter: function (this: PropertiesBase, alexaValue: AlexaV3DirectiveValue): ioBroker.StateValue {\n                return alexaValue === PowerState.ON;\n            },\n            alexaGetter: function (value: ioBroker.StateValue | undefined): AlexaV3DirectiveValue {\n                return value ? PowerState.ON : PowerState.OFF;\n            },\n        };\n    }\n\n    protected composeInitObjectBrightness(): {\n        setState: IotExternalDetectorState;\n        getState: IotExternalDetectorState;\n        alexaSetter?: (alexaValue: AlexaV3DirectiveValue) => ioBroker.StateValue | undefined;\n        alexaGetter?: (value: ioBroker.StateValue | undefined) => AlexaV3DirectiveValue;\n    } {\n        const map = this.statesMap;\n        return {\n            setState: this.states[map.dimmer] || this.states[map.brightness]!,\n            getState: this.states[map.dimmer] || this.states[map.brightness]!,\n            alexaSetter: function (this: PropertiesBase, alexaValue: AlexaV3DirectiveValue): ioBroker.StateValue {\n                return (\n                    denormalize_0_100(\n                        alexaValue as number,\n                        this.valuesRangeMin as number,\n                        this.valuesRangeMax as number,\n                    ) ?? 0\n                );\n            },\n            alexaGetter: function (\n                this: PropertiesBase,\n                value: ioBroker.StateValue | undefined,\n            ): AlexaV3DirectiveValue {\n                return normalize_0_100(value as number, this.valuesRangeMin as number, this.valuesRangeMax as number);\n            },\n        };\n    }\n\n    protected composeInitObjectColorTemperature(): {\n        setState: IotExternalDetectorState;\n        getState: IotExternalDetectorState;\n        alexaSetter?: (alexaValue: AlexaV3DirectiveValue) => ioBroker.StateValue | undefined;\n        alexaGetter?: (value: ioBroker.StateValue | undefined) => AlexaV3DirectiveValue;\n    } {\n        const map = this.statesMap;\n        return {\n            setState: this.states[map.temperature]!,\n            getState: this.states[map.temperature]!,\n            alexaSetter: function (\n                this: ColorTemperatureInKelvin,\n                alexaValue: AlexaV3DirectiveValue,\n            ): ioBroker.StateValue {\n                if (alexaValue === 1) {\n                    // increase directive\n                    const closest = closestFromList(\n                        (this.currentValue as number) || this.colorTemperatureTable[0],\n                        this.colorTemperatureTable,\n                    );\n                    let index = this.colorTemperatureTable.indexOf(closest) + 1;\n                    index = index >= this.colorTemperatureTable.length ? this.colorTemperatureTable.length - 1 : index;\n                    return this.colorTemperatureTable[index];\n                }\n                if (alexaValue === -1) {\n                    // decrease directive\n                    const closest = closestFromList(\n                        (this.currentValue as number) || this.colorTemperatureTable[0],\n                        this.colorTemperatureTable,\n                    );\n                    let index = this.colorTemperatureTable.indexOf(closest) - 1;\n                    index = index < 0 ? 0 : index;\n                    return this.colorTemperatureTable[index];\n                }\n\n                return alexaValue as number;\n            },\n            alexaGetter: function (value: ioBroker.StateValue | undefined): AlexaV3DirectiveValue {\n                return value as number;\n            },\n        };\n    }\n}\n"]}

package/{build-backend → build}/lib/AlexaSmartHomeV3/Controls/Dimmer.js

@@ -15,26 +15,20 @@ class Dimmer extends AdjustableControl_1.default {
     _powerState;
     _brightnessCapability;
     _brightness;
+    constructor(detectedControl) {
+        super(detectedControl);
+        this._powerControllerCapability = new PowerController_1.default(this.composeInitObjectPowerState());
+        this._powerState = this._powerControllerCapability.powerState;
+        this._brightnessCapability = new BrightnessController_1.default(this.composeInitObjectBrightness());
+        this._brightness = this._brightnessCapability.brightness;
+        this._supported = [this._powerControllerCapability, this._brightnessCapability];
+    }
     get categories() {
         return ['LIGHT'];
     }
     adjustableProperties() {
         return [Brightness_1.default];
     }
-    initCapabilities() {
-        this._powerControllerCapability = new PowerController_1.default();
-        this._powerState = this._powerControllerCapability.powerState;
-        this._brightnessCapability = new BrightnessController_1.default();
-        this._brightness = this._brightnessCapability.brightness;
-        const result = [this._powerControllerCapability, this._brightnessCapability];
-        for (const property of result.flatMap(item => item.properties)) {
-            const initObj = this.composeInitObject(property);
-            if (initObj) {
-                property.init(initObj);
-            }
-        }
-        return result;
-    }
     async setState(property, value) {
         // set the property itself
         await AdapterProvider_1.default.setState(property.setId, value);
@@ -88,7 +82,20 @@ class Dimmer extends AdjustableControl_1.default {
         }
         return property.currentValue;
     }
-    composeInitObject(property) {
+    composeInitObjectPowerState() {
+        const map = this.statesMap;
+        return {
+            setState: this.states[map.on_set] || this.states[map.set],
+            getState: this.states[map.on_actual] || this.states[map.on_set] || this.states[map.set],
+            alexaSetter: function (alexaValue) {
+                return alexaValue === PowerState_1.default.ON;
+            },
+            alexaGetter: function (value) {
+                return value ? PowerState_1.default.ON : PowerState_1.default.OFF;
+            },
+        };
+    }
+    composeInitObjectBrightness() {
         /*
             Device of type 'dimmer' can be switched 'ON'/'OFF' and its brightness can be set to a value between 0 and 100.
 
@@ -97,30 +104,16 @@ class Dimmer extends AdjustableControl_1.default {
             - switching control 'ON' is done via setting its brightness to the configured 'byOn' value or to the last known brightness.
         */
         const map = this.statesMap;
-        if (property.propertyName === PowerState_1.default.propertyName) {
-            return {
-                setState: this.states[map.on_set] || this.states[map.set],
-                getState: this.states[map.on_actual] || this.states[map.on_set] || this.states[map.set],
-                alexaSetter: function (alexaValue) {
-                    return alexaValue === PowerState_1.default.ON;
-                },
-                alexaGetter: function (value) {
-                    return value ? PowerState_1.default.ON : PowerState_1.default.OFF;
-                },
-            };
-        }
-        if (property.propertyName === Brightness_1.default.propertyName) {
-            return {
-                setState: this.states[map.set],
-                getState: this.states[map.actual],
-                alexaSetter: function (alexaValue) {
-                    return ((0, Utils_1.denormalize_0_100)(alexaValue, this.valuesRangeMin, this.valuesRangeMax) ?? 0);
-                },
-                alexaGetter: function (value) {
-                    return (0, Utils_1.normalize_0_100)(value, this.valuesRangeMin, this.valuesRangeMax);
-                },
-            };
-        }
+        return {
+            setState: this.states[map.set],
+            getState: this.states[map.actual],
+            alexaSetter: function (alexaValue) {
+                return ((0, Utils_1.denormalize_0_100)(alexaValue, this.valuesRangeMin, this.valuesRangeMax) ?? 0);
+            },
+            alexaGetter: function (value) {
+                return (0, Utils_1.normalize_0_100)(value, this.valuesRangeMin, this.valuesRangeMax);
+            },
+        };
     }
 }
 exports.default = Dimmer;

package/build/lib/AlexaSmartHomeV3/Controls/Dimmer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Dimmer.js","sourceRoot":"","sources":["../../../../src/lib/AlexaSmartHomeV3/Controls/Dimmer.ts"],"names":[],"mappings":"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","sourcesContent":["import PowerController from '../Alexa/Capabilities/PowerController';\nimport BrightnessController from '../Alexa/Capabilities/BrightnessController';\nimport AdjustableControl from './AdjustableControl';\nimport { configuredRangeOrDefault, denormalize_0_100, normalize_0_100 } from '../Helpers/Utils';\nimport PowerState from '../Alexa/Properties/PowerState';\nimport Brightness from '../Alexa/Properties/Brightness';\nimport AdapterProvider from '../Helpers/AdapterProvider';\nimport type {\n    AlexaV3Category,\n    AlexaV3DirectiveValue,\n    IotExternalDetectorState,\n    IotExternalPatternControl,\n} from '../types';\nimport type { Base as PropertiesBase } from '../Alexa/Properties/Base';\n\nexport default class Dimmer extends AdjustableControl {\n    private readonly _powerControllerCapability: PowerController;\n    private readonly _powerState: PowerState;\n    private readonly _brightnessCapability: BrightnessController;\n    private readonly _brightness: Brightness;\n\n    constructor(detectedControl: IotExternalPatternControl) {\n        super(detectedControl);\n\n        this._powerControllerCapability = new PowerController(this.composeInitObjectPowerState());\n        this._powerState = this._powerControllerCapability.powerState;\n\n        this._brightnessCapability = new BrightnessController(this.composeInitObjectBrightness());\n        this._brightness = this._brightnessCapability.brightness;\n\n        this._supported = [this._powerControllerCapability, this._brightnessCapability];\n    }\n\n    get categories(): AlexaV3Category[] {\n        return ['LIGHT'];\n    }\n\n    adjustableProperties(): (typeof PropertiesBase)[] {\n        return [Brightness];\n    }\n\n    async setState(property: PropertiesBase, value: ioBroker.StateValue): Promise<void> {\n        // set the property itself\n        await AdapterProvider.setState(property.setId, value);\n        property.currentValue = value;\n        const valuesRange = configuredRangeOrDefault(this.states[this.statesMap.set]!);\n\n        // todo: use adapter.config.deviceOffLevel\n        // If\n\n        if (property.propertyName === PowerState.propertyName) {\n            // set brightness\n            if (value) {\n                const smartName = this.states[this.statesMap.set]!.smartName;\n                let byOn: string | number | undefined | null;\n                if (smartName && typeof smartName === 'object') {\n                    byOn = smartName.byON;\n                }\n                // set byOn to the configured value or 100 otherwise\n                byOn =\n                    byOn === undefined || byOn === null || isNaN(byOn as number)\n                        ? (valuesRange.max as number)\n                        : parseFloat(byOn as string);\n                await AdapterProvider.setState(this._brightness.setId, byOn);\n                this._brightness.currentValue = byOn;\n            } else {\n                // set brightness to 0 on power OFF\n                await AdapterProvider.setState(this._brightness.setId, valuesRange.min);\n                this._brightness.currentValue = valuesRange.min;\n            }\n        } else {\n            // set power\n            const powerValue = value !== valuesRange.min;\n\n            // only do this on different IDs for brightness and power\n            if (this._brightness.setId !== this._powerState.setId) {\n                await AdapterProvider.setState(this._powerState.setId, powerValue);\n            }\n            this._powerState.currentValue = powerValue;\n        }\n    }\n\n    async getOrRetrieveCurrentValue(property: PropertiesBase): Promise<ioBroker.StateValue> {\n        if (property.currentValue === undefined) {\n            property.currentValue = await AdapterProvider.getState(property.getId);\n\n            const valuesRange = configuredRangeOrDefault(this.states[this.statesMap.set]!);\n            // convert non-zero brightness to power = true\n            if (property.propertyName === this._powerState.propertyName && property.getId === this._brightness.getId) {\n                property.currentValue = property.currentValue !== valuesRange.min;\n            }\n        }\n\n        if (property.currentValue === undefined) {\n            throw new Error(`unable to retrieve ${property.getId}`);\n        }\n\n        return property.currentValue;\n    }\n\n    private composeInitObjectPowerState(): {\n        setState: IotExternalDetectorState;\n        getState: IotExternalDetectorState;\n        alexaSetter?: (alexaValue: AlexaV3DirectiveValue) => ioBroker.StateValue | undefined;\n        alexaGetter?: (value: ioBroker.StateValue | undefined) => AlexaV3DirectiveValue;\n    } {\n        const map = this.statesMap;\n        return {\n            setState: this.states[map.on_set] || this.states[map.set]!,\n            getState: this.states[map.on_actual] || this.states[map.on_set] || this.states[map.set]!,\n            alexaSetter: function (this: PropertiesBase, alexaValue: AlexaV3DirectiveValue): ioBroker.StateValue {\n                return alexaValue === PowerState.ON;\n            },\n            alexaGetter: function (value: ioBroker.StateValue | undefined): AlexaV3DirectiveValue {\n                return value ? PowerState.ON : PowerState.OFF;\n            },\n        };\n    }\n\n    private composeInitObjectBrightness(): {\n        setState: IotExternalDetectorState;\n        getState: IotExternalDetectorState;\n        alexaSetter?: (alexaValue: AlexaV3DirectiveValue) => ioBroker.StateValue | undefined;\n        alexaGetter?: (value: ioBroker.StateValue | undefined) => AlexaV3DirectiveValue;\n    } {\n        /*\n            Device of type 'dimmer' can be switched 'ON'/'OFF' and its brightness can be set to a value between 0 and 100.\n\n            If there is no 'ON_SET' state available:\n            - switching control 'OFF' is done via setting its brightness to 0\n            - switching control 'ON' is done via setting its brightness to the configured 'byOn' value or to the last known brightness.\n        */\n\n        const map = this.statesMap;\n        return {\n            setState: this.states[map.set]!,\n            getState: this.states[map.actual]!,\n            alexaSetter: function (this: PropertiesBase, alexaValue: AlexaV3DirectiveValue): ioBroker.StateValue {\n                return (\n                    denormalize_0_100(\n                        alexaValue as number,\n                        this.valuesRangeMin as number,\n                        this.valuesRangeMax as number,\n                    ) ?? 0\n                );\n            },\n            alexaGetter: function (\n                this: PropertiesBase,\n                value: ioBroker.StateValue | undefined,\n            ): AlexaV3DirectiveValue {\n                return normalize_0_100(value as number, this.valuesRangeMin as number, this.valuesRangeMax as number);\n            },\n        };\n    }\n}\n"]}

package/{build-backend → build}/lib/AlexaSmartHomeV3/Controls/Gate.js

@@ -7,16 +7,14 @@ const Capabilities_1 = __importDefault(require("../Alexa/Capabilities"));
 const ModeValues_1 = __importDefault(require("../Alexa/ModeValues"));
 const Control_1 = __importDefault(require("./Control"));
 class Gate extends Control_1.default {
+    constructor(detectedControl) {
+        super(detectedControl);
+        const modeController = new Capabilities_1.default.ModeController(this.modeInitObject());
+        this._supported = [modeController];
+    }
     get categories() {
         return ['GARAGE_DOOR'];
     }
-    initCapabilities() {
-        const result = [new Capabilities_1.default.ModeController()];
-        for (const property of result.flatMap(item => item.properties)) {
-            property.init(this.modeInitObject());
-        }
-        return result;
-    }
     modeInitObject() {
         const map = this.statesMap;
         const mode = 'Gate.Position';

package/build/lib/AlexaSmartHomeV3/Controls/Gate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Gate.js","sourceRoot":"","sources":["../../../../src/lib/AlexaSmartHomeV3/Controls/Gate.ts"],"names":[],"mappings":";;;;;AAAA,yEAAiD;AACjD,qEAAwC;AACxC,wDAAgC;AAShC,MAAqB,IAAK,SAAQ,iBAAO;IACrC,YAAY,eAA0C;QAClD,KAAK,CAAC,eAAe,CAAC,CAAC;QACvB,MAAM,cAAc,GAAG,IAAI,sBAAY,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;QAC9E,IAAI,CAAC,UAAU,GAAG,CAAC,cAAc,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,UAAU;QACV,OAAO,CAAC,aAAa,CAAC,CAAC;IAC3B,CAAC;IAEO,cAAc;QAQlB,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC;QAC3B,MAAM,IAAI,GAAG,eAAe,CAAC;QAE7B,OAAO;YACH,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAE;YAC/B,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAE;YAC/B,WAAW,EAAE,UAAU,UAAU;gBAC7B,OAAO,UAAU,KAAK,GAAG,IAAI,IAAI,oBAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACxD,CAAC;YACD,WAAW,EAAE,UAAU,KAAK;gBACxB,OAAO,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,oBAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,oBAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACnF,CAAC;YACD,QAAQ,EAAE,IAAI;YACd,cAAc,EAAE,CAAC,IAAI,oBAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,oBAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SACjE,CAAC;IACN,CAAC;CACJ;AAnCD,uBAmCC","sourcesContent":["import Capabilities from '../Alexa/Capabilities';\nimport Modes from '../Alexa/ModeValues';\nimport Control from './Control';\nimport type { Base as ModeBase } from '../Alexa/ModeValues/Base';\nimport type {\n    AlexaV3Category,\n    AlexaV3DirectiveValue,\n    IotExternalDetectorState,\n    IotExternalPatternControl,\n} from '../types';\n\nexport default class Gate extends Control {\n    constructor(detectedControl: IotExternalPatternControl) {\n        super(detectedControl);\n        const modeController = new Capabilities.ModeController(this.modeInitObject());\n        this._supported = [modeController];\n    }\n\n    get categories(): AlexaV3Category[] {\n        return ['GARAGE_DOOR'];\n    }\n\n    private modeInitObject(): {\n        setState: IotExternalDetectorState;\n        getState: IotExternalDetectorState;\n        alexaSetter?: (alexaValue: AlexaV3DirectiveValue) => ioBroker.StateValue | undefined;\n        alexaGetter?: (value: ioBroker.StateValue | undefined) => AlexaV3DirectiveValue;\n        instance?: string;\n        supportedModes?: ModeBase[];\n    } {\n        const map = this.statesMap;\n        const mode = 'Gate.Position';\n\n        return {\n            setState: this.states[map.set]!,\n            getState: this.states[map.set]!,\n            alexaSetter: function (alexaValue) {\n                return alexaValue === `${mode}.${Modes.Open.value}`;\n            },\n            alexaGetter: function (value) {\n                return value ? `${mode}.${Modes.Open.value}` : `${mode}.${Modes.Closed.value}`;\n            },\n            instance: mode,\n            supportedModes: [new Modes.Open(mode), new Modes.Closed(mode)],\n        };\n    }\n}\n"]}