@fastybird/smart-panel-backend 1.1.0-alpha.2 → 1.1.0-alpha.21

package/dist/plugins/devices-home-assistant/utils/ha-event.utils.d.ts

@@ -0,0 +1,2 @@
+export declare function normalizeHaEventType(haEventType: string): string;
+export declare function mapHaEventTypesToFormat(eventTypes: string[]): string[];

package/dist/plugins/devices-home-assistant/utils/ha-event.utils.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeHaEventType = normalizeHaEventType;
+exports.mapHaEventTypesToFormat = mapHaEventTypesToFormat;
+function normalizeHaEventType(haEventType) {
+    const trimmed = haEventType.trim().toLowerCase();
+    switch (trimmed) {
+        case 'press':
+        case 'single':
+        case 'single_press':
+        case 'click':
+        case 'short_press':
+        case 'button_press':
+            return 'press';
+        case 'double':
+        case 'double_press':
+        case 'double_click':
+            return 'double_press';
+        case 'triple':
+        case 'triple_press':
+        case 'triple_click':
+            return 'triple_press';
+        case 'hold':
+        case 'long_press':
+        case 'long_click':
+        case 'press_hold':
+            return 'long_press';
+        case 'release':
+        case 'release_hold':
+            return 'release';
+        case 'up':
+        case 'arrow_up':
+            return 'up';
+        case 'down':
+        case 'arrow_down':
+            return 'down';
+        default:
+            return trimmed;
+    }
+}
+function mapHaEventTypesToFormat(eventTypes) {
+    const mapped = new Set();
+    for (const type of eventTypes) {
+        if (typeof type === 'string' && type.trim().length > 0) {
+            mapped.add(normalizeHaEventType(type));
+        }
+    }
+    return Array.from(mapped);
+}
+//# sourceMappingURL=ha-event.utils.js.map

package/dist/plugins/devices-home-assistant/utils/ha-event.utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ha-event.utils.js","sourceRoot":"","sources":["../../../../src/plugins/devices-home-assistant/utils/ha-event.utils.ts"],"names":[],"mappings":";;AAGA,oDAmCC;AAKD,0DAQC;AAhDD,SAAgB,oBAAoB,CAAC,WAAmB;IACvD,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACjD,QAAQ,OAAO,EAAE,CAAC;QACjB,KAAK,OAAO,CAAC;QACb,KAAK,QAAQ,CAAC;QACd,KAAK,cAAc,CAAC;QACpB,KAAK,OAAO,CAAC;QACb,KAAK,aAAa,CAAC;QACnB,KAAK,cAAc;YAClB,OAAO,OAAO,CAAC;QAChB,KAAK,QAAQ,CAAC;QACd,KAAK,cAAc,CAAC;QACpB,KAAK,cAAc;YAClB,OAAO,cAAc,CAAC;QACvB,KAAK,QAAQ,CAAC;QACd,KAAK,cAAc,CAAC;QACpB,KAAK,cAAc;YAClB,OAAO,cAAc,CAAC;QACvB,KAAK,MAAM,CAAC;QACZ,KAAK,YAAY,CAAC;QAClB,KAAK,YAAY,CAAC;QAClB,KAAK,YAAY;YAChB,OAAO,YAAY,CAAC;QACrB,KAAK,SAAS,CAAC;QACf,KAAK,cAAc;YAClB,OAAO,SAAS,CAAC;QAClB,KAAK,IAAI,CAAC;QACV,KAAK,UAAU;YACd,OAAO,IAAI,CAAC;QACb,KAAK,MAAM,CAAC;QACZ,KAAK,YAAY;YAChB,OAAO,MAAM,CAAC;QACf;YACC,OAAO,OAAO,CAAC;IACjB,CAAC;AACF,CAAC;AAKD,SAAgB,uBAAuB,CAAC,UAAoB;IAC3D,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IACjC,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QAC/B,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxD,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;QACxC,CAAC;IACF,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC3B,CAAC"}

package/dist/plugins/devices-homekit/listeners/homekit-event.listener.d.ts

@@ -1,8 +1,10 @@
 import { ChannelPropertyEntity } from '../../../modules/devices/entities/devices.entity';
+import { ChannelInputOccurrencePayload } from '../../../modules/devices/models/channel-input-occurrence.model';
 import { HomeKitMapperRegistryService } from '../services/homekit-mapper-registry.service';
 export declare class HomeKitEventListener {
     private readonly mapperRegistry;
     private readonly logger;
     constructor(mapperRegistry: HomeKitMapperRegistryService);
     handlePropertyValueChanged(property: ChannelPropertyEntity): void;
+    handleChannelInputOccurrence(occurrence: ChannelInputOccurrencePayload): void;
 }

package/dist/plugins/devices-homekit/listeners/homekit-event.listener.js

@@ -15,6 +15,7 @@ const common_1 = require("@nestjs/common");
 const event_emitter_1 = require("@nestjs/event-emitter");
 const devices_constants_1 = require("../../../modules/devices/devices.constants");
 const devices_entity_1 = require("../../../modules/devices/entities/devices.entity");
+const channel_input_occurrence_model_1 = require("../../../modules/devices/models/channel-input-occurrence.model");
 const homekit_mapper_registry_service_1 = require("../services/homekit-mapper-registry.service");
 let HomeKitEventListener = HomeKitEventListener_1 = class HomeKitEventListener {
     constructor(mapperRegistry) {
@@ -33,11 +34,16 @@ let HomeKitEventListener = HomeKitEventListener_1 = class HomeKitEventListener {
         const rawValue = property.value?.value;
         for (const binding of bindings) {
             try {
-                binding.revision++;
                 const hapValue = binding.toHomeKit
                     ? binding.toHomeKit(rawValue)
                     : rawValue;
+                if (binding.pendingWrite && Object.is(hapValue, binding.pendingWrite.previousValue)) {
+                    this.logger.debug(`Suppressing stale HomeKit characteristic update: property=${property.id} value=${JSON.stringify(rawValue)}`);
+                    continue;
+                }
+                binding.revision++;
                 binding.currentValue = hapValue;
+                binding.pendingWrite = undefined;
                 this.logger.debug(`Updating HomeKit characteristic: property=${property.id} value=${JSON.stringify(rawValue)} -> HAP=${JSON.stringify(hapValue)}`);
                 binding.characteristic.updateValue(hapValue);
             }
@@ -56,6 +62,21 @@ let HomeKitEventListener = HomeKitEventListener_1 = class HomeKitEventListener {
             }
         }
     }
+    handleChannelInputOccurrence(occurrence) {
+        if (!occurrence || !occurrence.propertyId) {
+            return;
+        }
+        const listeners = this.mapperRegistry.getOccurrenceListeners(occurrence.propertyId);
+        for (const listener of listeners) {
+            try {
+                listener.onOccurrence(occurrence);
+            }
+            catch (error) {
+                const err = error;
+                this.logger.warn(`Failed to process HomeKit input occurrence for device=${occurrence.deviceId} channel=${occurrence.channelId} property=${occurrence.propertyId}: ${err.message}`);
+            }
+        }
+    }
 };
 exports.HomeKitEventListener = HomeKitEventListener;
 __decorate([
@@ -65,6 +86,12 @@ __decorate([
     __metadata("design:paramtypes", [devices_entity_1.ChannelPropertyEntity]),
     __metadata("design:returntype", void 0)
 ], HomeKitEventListener.prototype, "handlePropertyValueChanged", null);
+__decorate([
+    (0, event_emitter_1.OnEvent)(devices_constants_1.EventType.CHANNEL_INPUT_OCCURRENCE),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [channel_input_occurrence_model_1.ChannelInputOccurrencePayload]),
+    __metadata("design:returntype", void 0)
+], HomeKitEventListener.prototype, "handleChannelInputOccurrence", null);
 exports.HomeKitEventListener = HomeKitEventListener = HomeKitEventListener_1 = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [homekit_mapper_registry_service_1.HomeKitMapperRegistryService])

package/dist/plugins/devices-homekit/listeners/homekit-event.listener.js.map

@@ -1 +1 @@
-{"version":3,"file":"homekit-event.listener.js","sourceRoot":"","sources":["../../../../src/plugins/devices-homekit/listeners/homekit-event.listener.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,2CAAoD;AACpD,yDAAgD;AAEhD,kFAA2F;AAC3F,qFAAyF;AACzF,iGAA2F;AAGpF,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;IAGhC,YAA6B,cAA4C;QAA5C,mBAAc,GAAd,cAAc,CAA8B;QAFxD,WAAM,GAAG,IAAI,eAAM,CAAC,sBAAoB,CAAC,IAAI,CAAC,CAAC;IAEY,CAAC;IAI7E,0BAA0B,CAAC,QAA+B;QACzD,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YAC/B,OAAO;QACR,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACzE,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAE3E,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrD,OAAO;QACR,CAAC;QAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;QAEvC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAChC,IAAI,CAAC;gBACJ,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACnB,MAAM,QAAQ,GAAwB,OAAO,CAAC,SAAS;oBACtD,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC;oBAC7B,CAAC,CAAE,QAAgC,CAAC;gBACrC,OAAO,CAAC,YAAY,GAAG,QAAQ,CAAC;gBAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,6CAA6C,QAAQ,CAAC,EAAE,UAAU,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAC/H,CAAC;gBACF,OAAO,CAAC,cAAc,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAC9C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,MAAM,GAAG,GAAG,KAAc,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wDAAwD,QAAQ,CAAC,EAAE,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YACzG,CAAC;QACF,CAAC;QAED,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAClC,IAAI,CAAC;gBACJ,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAChD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,MAAM,GAAG,GAAG,KAAc,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2DAA2D,QAAQ,CAAC,EAAE,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5G,CAAC;QACF,CAAC;IACF,CAAC;CACD,CAAA;AA/CY,oDAAoB;AAOhC;IAFC,IAAA,uBAAO,EAAC,6BAAgB,CAAC,0BAA0B,CAAC;IACpD,IAAA,uBAAO,EAAC,6BAAgB,CAAC,wBAAwB,CAAC;;qCACd,sCAAqB;;sEAuCzD;+BA9CW,oBAAoB;IADhC,IAAA,mBAAU,GAAE;qCAIiC,8DAA4B;GAH7D,oBAAoB,CA+ChC"}
+{"version":3,"file":"homekit-event.listener.js","sourceRoot":"","sources":["../../../../src/plugins/devices-homekit/listeners/homekit-event.listener.ts"],"names":[],"mappings":"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"}

package/dist/plugins/devices-homekit/mappers/base.mapper.js

@@ -59,11 +59,34 @@ class BaseHomeKitMapper {
         const isCharacteristicWritable = characteristic.props.perms.includes("pw");
         if (isPropertyWritable && isCharacteristicWritable) {
             characteristic.onSet(async (value) => {
-                const targetRev = ++binding.revision;
+                const startingRevision = binding.revision;
+                const token = (binding.nextWriteToken ?? 0) + 1;
+                binding.nextWriteToken = token;
+                binding.revision = startingRevision + 1;
+                binding.pendingWrite = {
+                    token,
+                    previousValue: binding.currentValue,
+                    requestedValue: value,
+                    startingRevision,
+                };
+                binding.currentValue = value;
                 const smartPanelValue = fromHomeKit(value);
-                await context.commandDispatcher.dispatch(property.id, smartPanelValue);
-                if (binding.revision === targetRev) {
-                    binding.currentValue = value;
+                try {
+                    await context.commandDispatcher.dispatch(property.id, smartPanelValue);
+                }
+                catch (error) {
+                    if (binding.pendingWrite?.token === token &&
+                        binding.revision === startingRevision + 1 &&
+                        Object.is(binding.currentValue, value)) {
+                        binding.currentValue = binding.pendingWrite.previousValue;
+                        binding.characteristic.updateValue(binding.pendingWrite.previousValue);
+                    }
+                    throw error;
+                }
+                finally {
+                    if (binding.pendingWrite?.token === token) {
+                        binding.pendingWrite = undefined;
+                    }
                 }
             });
         }

package/dist/plugins/devices-homekit/mappers/base.mapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.mapper.js","sourceRoot":"","sources":["../../../../src/plugins/devices-homekit/mappers/base.mapper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base.mapper.js","sourceRoot":"","sources":["../../../../src/plugins/devices-homekit/mappers/base.mapper.ts"],"names":[],"mappings":"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"}

package/dist/plugins/devices-homekit/mappers/button.mapper.d.ts

@@ -0,0 +1,15 @@
+import { Accessory } from '@homebridge/hap-nodejs';
+import { ChannelEntity, ChannelPropertyEntity, DeviceEntity } from '../../../modules/devices/entities/devices.entity';
+import { BaseHomeKitMapper } from './base.mapper';
+import { HomeKitMapperContext } from './homekit-mapper.interface';
+export declare class ButtonMapper extends BaseHomeKitMapper {
+    private static readonly logger;
+    canMap(device: DeviceEntity): boolean;
+    getSuggestedServiceType(_device: DeviceEntity): string;
+    buildAccessory(device: DeviceEntity, context: HomeKitMapperContext): Accessory | null;
+    static isButtonChannel(channel: ChannelEntity): boolean;
+    static getButtonChannels(device: DeviceEntity): ChannelEntity[];
+    static mapEventToHap(event?: string): number | null;
+    static resolveValidValues(property?: ChannelPropertyEntity): number[];
+    static attachButtonServices(accessory: Accessory, device: DeviceEntity, context: HomeKitMapperContext): void;
+}

package/dist/plugins/devices-homekit/mappers/button.mapper.js

@@ -0,0 +1,143 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ButtonMapper = void 0;
+const hap_nodejs_1 = require("@homebridge/hap-nodejs");
+const extension_logger_service_1 = require("../../../common/logger/extension-logger.service");
+const devices_constants_1 = require("../../../modules/devices/devices.constants");
+const devices_homekit_constants_1 = require("../devices-homekit.constants");
+const base_mapper_1 = require("./base.mapper");
+class ButtonMapper extends base_mapper_1.BaseHomeKitMapper {
+    canMap(device) {
+        return ButtonMapper.getButtonChannels(device).length > 0;
+    }
+    getSuggestedServiceType(_device) {
+        return 'button';
+    }
+    buildAccessory(device, context) {
+        const buttonChannels = ButtonMapper.getButtonChannels(device);
+        if (buttonChannels.length === 0) {
+            return null;
+        }
+        const accessory = this.createBaseAccessory(device, 15);
+        ButtonMapper.attachButtonServices(accessory, device, context);
+        return accessory;
+    }
+    static isButtonChannel(channel) {
+        if (channel.category === devices_constants_1.ChannelCategory.BUTTON) {
+            return true;
+        }
+        if (channel.category === devices_constants_1.ChannelCategory.BINARY_INPUT) {
+            return (channel.properties?.some((p) => p.category === devices_constants_1.PropertyCategory.EVENT || p.permissions?.includes(devices_constants_1.PermissionType.EVENT_ONLY)) ?? false);
+        }
+        return false;
+    }
+    static getButtonChannels(device) {
+        return device.channels?.filter((channel) => ButtonMapper.isButtonChannel(channel)) ?? [];
+    }
+    static mapEventToHap(event) {
+        if (!event) {
+            return null;
+        }
+        const normalized = event.toLowerCase().trim();
+        switch (normalized) {
+            case 'press':
+            case 'single':
+            case 'single_press':
+            case 'click':
+            case 'button_1':
+                return hap_nodejs_1.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS;
+            case 'double':
+            case 'double_press':
+            case 'double_click':
+            case 'button_2':
+                return hap_nodejs_1.Characteristic.ProgrammableSwitchEvent.DOUBLE_PRESS;
+            case 'long_press':
+            case 'hold':
+            case 'long_click':
+            case 'button_3':
+                return hap_nodejs_1.Characteristic.ProgrammableSwitchEvent.LONG_PRESS;
+            default:
+                return null;
+        }
+    }
+    static resolveValidValues(property) {
+        if (!property || !property.format) {
+            return [
+                hap_nodejs_1.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS,
+                hap_nodejs_1.Characteristic.ProgrammableSwitchEvent.DOUBLE_PRESS,
+                hap_nodejs_1.Characteristic.ProgrammableSwitchEvent.LONG_PRESS,
+            ];
+        }
+        const formats = Array.isArray(property.format)
+            ? property.format.map((f) => String(f).toLowerCase())
+            : [String(property.format).toLowerCase()];
+        const valid = new Set();
+        for (const f of formats) {
+            const hap = ButtonMapper.mapEventToHap(f);
+            if (hap !== null) {
+                valid.add(hap);
+            }
+        }
+        return valid.size > 0 ? Array.from(valid).sort((a, b) => a - b) : [];
+    }
+    static attachButtonServices(accessory, device, context) {
+        const buttonChannels = ButtonMapper.getButtonChannels(device);
+        if (buttonChannels.length === 0) {
+            return;
+        }
+        if (buttonChannels.length > 1) {
+            let labelService = accessory.getService(hap_nodejs_1.Service.ServiceLabel);
+            if (!labelService) {
+                labelService = accessory.addService(hap_nodejs_1.Service.ServiceLabel, `${device.name} Buttons`);
+                labelService
+                    .getCharacteristic(hap_nodejs_1.Characteristic.ServiceLabelNamespace)
+                    .setValue(hap_nodejs_1.Characteristic.ServiceLabelNamespace.ARABIC_NUMERALS);
+            }
+        }
+        buttonChannels.forEach((channel, index) => {
+            if (accessory.getServiceById(hap_nodejs_1.Service.StatelessProgrammableSwitch, channel.id)) {
+                return;
+            }
+            const serviceIndex = index + 1;
+            const serviceName = buttonChannels.length === 1 ? device.name : `${device.name} ${channel.name || `Button ${serviceIndex}`}`;
+            const eventProp = channel.properties?.find((p) => p.category === devices_constants_1.PropertyCategory.EVENT) ??
+                channel.properties?.find((p) => p.permissions?.includes(devices_constants_1.PermissionType.EVENT_ONLY)) ??
+                channel.properties?.[0];
+            if (!eventProp) {
+                return;
+            }
+            const validValues = ButtonMapper.resolveValidValues(eventProp);
+            if (validValues.length === 0) {
+                return;
+            }
+            const switchService = accessory.addService(hap_nodejs_1.Service.StatelessProgrammableSwitch, serviceName, channel.id);
+            if (buttonChannels.length > 1) {
+                const indexChar = switchService.getCharacteristic(hap_nodejs_1.Characteristic.ServiceLabelIndex);
+                indexChar.setValue(serviceIndex);
+            }
+            const switchEventChar = switchService.getCharacteristic(hap_nodejs_1.Characteristic.ProgrammableSwitchEvent);
+            switchEventChar.onGet(() => null);
+            switchEventChar.setProps({ validValues });
+            context.registerOccurrenceListener?.({
+                deviceId: device.id,
+                channelId: channel.id,
+                propertyId: eventProp.id,
+                onOccurrence: (occurrence) => {
+                    const hapEvent = ButtonMapper.mapEventToHap(occurrence.event);
+                    if (hapEvent === null) {
+                        ButtonMapper.logger.debug(`Dropping unsupported input occurrence event="${occurrence.event}" for device="${device.id}" channel="${channel.id}"`);
+                        return;
+                    }
+                    if (!validValues.includes(hapEvent)) {
+                        ButtonMapper.logger.warn(`Dropping occurrence event="${occurrence.event}" (HAP ${hapEvent}) outside validValues=[${validValues.join(',')}] for channel="${channel.id}"`);
+                        return;
+                    }
+                    switchEventChar.sendEventNotification(hapEvent);
+                },
+            });
+        });
+    }
+}
+exports.ButtonMapper = ButtonMapper;
+ButtonMapper.logger = (0, extension_logger_service_1.createExtensionLogger)(devices_homekit_constants_1.DEVICES_HOMEKIT_PLUGIN_NAME, 'ButtonMapper');
+//# sourceMappingURL=button.mapper.js.map

package/dist/plugins/devices-homekit/mappers/button.mapper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"button.mapper.js","sourceRoot":"","sources":["../../../../src/plugins/devices-homekit/mappers/button.mapper.ts"],"names":[],"mappings":"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"}

package/dist/plugins/devices-homekit/mappers/homekit-mapper.interface.d.ts

@@ -1,6 +1,13 @@
 import { Characteristic, CharacteristicValue } from '@homebridge/hap-nodejs';
 import { ChannelPropertyEntity, DeviceEntity } from '../../../modules/devices/entities/devices.entity';
+import { ChannelInputOccurrencePayload } from '../../../modules/devices/models/channel-input-occurrence.model';
 import { HomeKitCommandDispatcher } from '../services/homekit-command.dispatcher';
+export interface CharacteristicPendingWrite {
+    token: number;
+    previousValue: CharacteristicValue;
+    requestedValue: CharacteristicValue;
+    startingRevision: number;
+}
 export interface CharacteristicBinding {
     deviceId: string;
     channelId: string;
@@ -10,16 +17,25 @@ export interface CharacteristicBinding {
     fromHomeKit?: (value: CharacteristicValue) => unknown;
     currentValue: CharacteristicValue;
     revision: number;
+    nextWriteToken?: number;
+    pendingWrite?: CharacteristicPendingWrite;
 }
 export interface PropertyEventListener {
     deviceId: string;
     propertyId: string;
     onPropertyChanged: (property: ChannelPropertyEntity, rawValue: unknown) => void;
 }
+export interface InputOccurrenceListener {
+    deviceId: string;
+    channelId: string;
+    propertyId: string;
+    onOccurrence: (occurrence: ChannelInputOccurrencePayload) => void;
+}
 export interface HomeKitMapperContext {
     readonly commandDispatcher: HomeKitCommandDispatcher;
     registerBinding(binding: CharacteristicBinding): void;
     registerPropertyListener(listener: PropertyEventListener): void;
+    registerOccurrenceListener?(listener: InputOccurrenceListener): void;
 }
 export interface IHomeKitAccessoryMapper {
     canMap(device: DeviceEntity): boolean;

package/dist/plugins/devices-homekit/mappers/thermostat-coordinator.d.ts

@@ -21,6 +21,8 @@ export declare class ThermostatCoordinator {
     private readonly config;
     private readonly values;
     private readonly revisions;
+    private readonly pendingWrites;
+    private nextWriteToken;
     private readonly currentHeatingCoolingChar;
     private readonly targetHeatingCoolingChar;
     private readonly currentTempChar;
@@ -34,6 +36,11 @@ export declare class ThermostatCoordinator {
     private isPropertyWritable;
     private setupGettersAndSetters;
     private registerEventListeners;
+    private beginPendingWrite;
+    private ownsPendingWrite;
+    private dispatchPending;
+    private dispatchPendingBatch;
+    private refreshFresherState;
     private refreshCharacteristics;
     private getLockPhysicalControls;
     private getAmbientTemperature;

package/dist/plugins/devices-homekit/mappers/thermostat-coordinator.js

@@ -8,6 +8,8 @@ class ThermostatCoordinator {
         this.config = config;
         this.values = new Map();
         this.revisions = new Map();
+        this.pendingWrites = new Map();
+        this.nextWriteToken = 0;
         const { service } = config;
         this.currentHeatingCoolingChar = service.getCharacteristic(hap_nodejs_1.Characteristic.CurrentHeatingCoolingState);
         this.targetHeatingCoolingChar = service.getCharacteristic(hap_nodejs_1.Characteristic.TargetHeatingCoolingState);
@@ -106,26 +108,7 @@ class ThermostatCoordinator {
                     }
                 }
                 if (commands.length > 0) {
-                    const targetRevs = new Map();
-                    for (const cmd of commands) {
-                        const nextRev = (this.revisions.get(cmd.propertyId) ?? 0) + 1;
-                        this.revisions.set(cmd.propertyId, nextRev);
-                        targetRevs.set(cmd.propertyId, nextRev);
-                    }
-                    await this.config.context.commandDispatcher.dispatchBatch(commands);
-                    let hadConflict = false;
-                    for (const cmd of commands) {
-                        if (this.revisions.get(cmd.propertyId) === targetRevs.get(cmd.propertyId)) {
-                            this.values.set(cmd.propertyId, cmd.value);
-                        }
-                        else {
-                            hadConflict = true;
-                        }
-                    }
-                    this.refreshCharacteristics();
-                    if (hadConflict) {
-                        process.nextTick(() => this.refreshCharacteristics());
-                    }
+                    await this.dispatchPendingBatch(commands);
                 }
             });
         }
@@ -170,26 +153,7 @@ class ThermostatCoordinator {
                     }
                 }
                 if (commands.length > 0) {
-                    const targetRevs = new Map();
-                    for (const cmd of commands) {
-                        const nextRev = (this.revisions.get(cmd.propertyId) ?? 0) + 1;
-                        this.revisions.set(cmd.propertyId, nextRev);
-                        targetRevs.set(cmd.propertyId, nextRev);
-                    }
-                    await this.config.context.commandDispatcher.dispatchBatch(commands);
-                    let hadConflict = false;
-                    for (const cmd of commands) {
-                        if (this.revisions.get(cmd.propertyId) === targetRevs.get(cmd.propertyId)) {
-                            this.values.set(cmd.propertyId, cmd.value);
-                        }
-                        else {
-                            hadConflict = true;
-                        }
-                    }
-                    this.refreshCharacteristics();
-                    if (hadConflict) {
-                        process.nextTick(() => this.refreshCharacteristics());
-                    }
+                    await this.dispatchPendingBatch(commands);
                 }
             });
         }
@@ -207,17 +171,7 @@ class ThermostatCoordinator {
                 this.heatingThresholdChar.props.perms.includes("pw")) {
                 this.heatingThresholdChar.onSet(async (value) => {
                     const target = Number(value);
-                    const targetRev = (this.revisions.get(heaterTempProp.id) ?? 0) + 1;
-                    this.revisions.set(heaterTempProp.id, targetRev);
-                    await this.config.context.commandDispatcher.dispatch(heaterTempProp.id, target);
-                    const hasConflict = this.revisions.get(heaterTempProp.id) !== targetRev;
-                    if (!hasConflict) {
-                        this.values.set(heaterTempProp.id, target);
-                    }
-                    this.refreshCharacteristics();
-                    if (hasConflict) {
-                        process.nextTick(() => this.refreshCharacteristics());
-                    }
+                    await this.dispatchPending(heaterTempProp.id, target);
                 });
             }
         }
@@ -235,17 +189,7 @@ class ThermostatCoordinator {
                 this.coolingThresholdChar.props.perms.includes("pw")) {
                 this.coolingThresholdChar.onSet(async (value) => {
                     const target = Number(value);
-                    const targetRev = (this.revisions.get(coolerTempProp.id) ?? 0) + 1;
-                    this.revisions.set(coolerTempProp.id, targetRev);
-                    await this.config.context.commandDispatcher.dispatch(coolerTempProp.id, target);
-                    const hasConflict = this.revisions.get(coolerTempProp.id) !== targetRev;
-                    if (!hasConflict) {
-                        this.values.set(coolerTempProp.id, target);
-                    }
-                    this.refreshCharacteristics();
-                    if (hasConflict) {
-                        process.nextTick(() => this.refreshCharacteristics());
-                    }
+                    await this.dispatchPending(coolerTempProp.id, target);
                 });
             }
         }
@@ -256,17 +200,7 @@ class ThermostatCoordinator {
             if (this.isPropertyWritable(lockProp) && this.lockPhysicalControlsChar.props.perms.includes("pw")) {
                 this.lockPhysicalControlsChar.onSet(async (value) => {
                     const isLocked = value === hap_nodejs_1.Characteristic.LockPhysicalControls.CONTROL_LOCK_ENABLED;
-                    const targetRev = (this.revisions.get(lockProp.id) ?? 0) + 1;
-                    this.revisions.set(lockProp.id, targetRev);
-                    await this.config.context.commandDispatcher.dispatch(lockProp.id, isLocked);
-                    const hasConflict = this.revisions.get(lockProp.id) !== targetRev;
-                    if (!hasConflict) {
-                        this.values.set(lockProp.id, isLocked);
-                    }
-                    this.refreshCharacteristics();
-                    if (hasConflict) {
-                        process.nextTick(() => this.refreshCharacteristics());
-                    }
+                    await this.dispatchPending(lockProp.id, isLocked);
                 });
             }
         }
@@ -287,14 +221,91 @@ class ThermostatCoordinator {
                 deviceId: this.config.device.id,
                 propertyId: prop.id,
                 onPropertyChanged: (_property, rawValue) => {
+                    const pending = this.pendingWrites.get(prop.id);
+                    if (pending && Object.is(rawValue, pending.previousValue)) {
+                        return;
+                    }
                     this.revisions.set(prop.id, (this.revisions.get(prop.id) ?? 0) + 1);
                     this.values.set(prop.id, rawValue);
+                    this.pendingWrites.delete(prop.id);
                     this.refreshCharacteristics();
                 },
             };
             this.config.context.registerPropertyListener(listener);
         }
     }
+    beginPendingWrite(propertyId, requestedValue) {
+        const startingRevision = this.revisions.get(propertyId) ?? 0;
+        const pending = {
+            token: ++this.nextWriteToken,
+            previousValue: this.values.get(propertyId),
+            requestedValue,
+            startingRevision,
+        };
+        this.revisions.set(propertyId, startingRevision + 1);
+        this.values.set(propertyId, requestedValue);
+        this.pendingWrites.set(propertyId, pending);
+        return pending;
+    }
+    ownsPendingWrite(propertyId, pending) {
+        return (this.pendingWrites.get(propertyId)?.token === pending.token &&
+            this.revisions.get(propertyId) === pending.startingRevision + 1 &&
+            Object.is(this.values.get(propertyId), pending.requestedValue));
+    }
+    async dispatchPending(propertyId, value) {
+        await this.dispatchPendingBatch([{ propertyId, value }], false);
+    }
+    async dispatchPendingBatch(commands, useBatch = true) {
+        const pendingWrites = new Map();
+        let failureHandled = false;
+        for (const command of commands) {
+            pendingWrites.set(command.propertyId, this.beginPendingWrite(command.propertyId, command.value));
+        }
+        this.refreshCharacteristics();
+        try {
+            if (useBatch) {
+                await this.config.context.commandDispatcher.dispatchBatch(commands);
+            }
+            else {
+                await this.config.context.commandDispatcher.dispatch(commands[0].propertyId, commands[0].value);
+            }
+        }
+        catch (error) {
+            failureHandled = true;
+            let hadConflict = false;
+            for (const [propertyId, pending] of pendingWrites) {
+                if (this.ownsPendingWrite(propertyId, pending)) {
+                    this.values.set(propertyId, pending.previousValue);
+                    this.pendingWrites.delete(propertyId);
+                }
+                else {
+                    hadConflict = true;
+                }
+            }
+            this.refreshCharacteristics();
+            if (hadConflict) {
+                this.refreshFresherState();
+            }
+            throw error;
+        }
+        finally {
+            let hadConflict = false;
+            for (const [propertyId, pending] of pendingWrites) {
+                if (this.pendingWrites.get(propertyId)?.token === pending.token) {
+                    this.pendingWrites.delete(propertyId);
+                }
+                else {
+                    hadConflict = true;
+                }
+            }
+            if (!failureHandled && hadConflict) {
+                this.refreshFresherState();
+            }
+        }
+    }
+    refreshFresherState() {
+        process.nextTick(() => this.refreshCharacteristics());
+    }
     refreshCharacteristics() {
         this.currentTempChar.updateValue(this.getAmbientTemperature());
         this.currentHeatingCoolingChar.updateValue(this.deriveCurrentHeatingCoolingState());