@fastybird/smart-panel-backend 1.1.0-alpha.15 → 1.1.0-alpha.16

package/dist/modules/system/services/update-executor.service.js

@@ -21,8 +21,10 @@ const system_constants_1 = require("../system.constants");
 const privileged_worker_service_1 = require("./privileged-worker.service");
 const update_service_1 = require("./update.service");
 const STATUS_FILE = '/var/lib/smart-panel/update-status.json';
+const ATTEMPT_FILE = '/var/lib/smart-panel/update-attempt/attempt.json';
 const UPDATE_TIMEOUT_MS = 10 * 60 * 1000;
 const STATUS_POLL_MAX_MS = UPDATE_TIMEOUT_MS + 30_000;
+const ATTEMPT_RECONCILIATION_POLL_INTERVAL_MS = 3_000;
 const UPDATE_WORKER_UNIT = 'smart-panel-update';
 const PHASE_PROGRESS = {
     downloading: 20,
@@ -55,40 +57,145 @@ let UpdateExecutorService = class UpdateExecutorService {
     async onModuleInit() {
         await this.checkPendingUpdateStatus();
     }
+    readAttempt() {
+        if (!(0, fs_1.existsSync)(ATTEMPT_FILE)) {
+            return null;
+        }
+        try {
+            return JSON.parse((0, fs_1.readFileSync)(ATTEMPT_FILE, 'utf-8'));
+        }
+        catch (error) {
+            const err = error;
+            this.logger.error(`Failed to read update attempt record: ${err.message}`);
+            return null;
+        }
+    }
+    isAttemptUnresolved(attempt) {
+        return Boolean(attempt && (attempt.state === 'active' || attempt.recoveryRequired === true));
+    }
+    isAttemptOwnerAlive(attempt) {
+        if (!Number.isInteger(attempt.ownerPid) || attempt.ownerPid <= 0) {
+            return false;
+        }
+        try {
+            process.kill(attempt.ownerPid, 0);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    readStatusFile() {
+        if (!(0, fs_1.existsSync)(STATUS_FILE)) {
+            return null;
+        }
+        return JSON.parse((0, fs_1.readFileSync)(STATUS_FILE, 'utf-8'));
+    }
+    async waitForAttemptSettlement(initialAttempt) {
+        let attempt = initialAttempt;
+        let status = null;
+        const deadline = Date.now() + STATUS_POLL_MAX_MS;
+        while (this.isAttemptUnresolved(attempt) && this.isAttemptOwnerAlive(attempt)) {
+            if (Date.now() >= deadline) {
+                break;
+            }
+            await new Promise((resolve) => {
+                setTimeout(resolve, ATTEMPT_RECONCILIATION_POLL_INTERVAL_MS).unref?.();
+            });
+            attempt = this.readAttempt();
+            try {
+                status = this.readStatusFile();
+            }
+            catch {
+                status = null;
+            }
+        }
+        return { attempt, status };
+    }
+    async reconcileCompletedAttempt(attempt, status) {
+        const targetVersion = status?.targetVersion ?? attempt.targetVersion;
+        this.logger.log(`Update to ${targetVersion} completed successfully (durable attempt record)`);
+        this.updateService.setStatus({
+            status: system_constants_1.UpdateStatusType.COMPLETE,
+            phase: system_constants_1.UpdatePhase.COMPLETE,
+            progressPercent: 100,
+            message: `Successfully updated to ${targetVersion}`,
+            error: null,
+        });
+        await this.reportUpdateSucceeded();
+        if ((0, fs_1.existsSync)(STATUS_FILE)) {
+            (0, fs_1.unlinkSync)(STATUS_FILE);
+        }
+    }
+    async reconcileLiveAttempt(attempt) {
+        const settled = await this.waitForAttemptSettlement(attempt);
+        if (settled.attempt?.state === 'complete') {
+            await this.reconcileCompletedAttempt(settled.attempt, settled.status);
+            this.updateService.releaseUpdateLock();
+            return;
+        }
+        if (this.isAttemptUnresolved(settled.attempt)) {
+            const recoveryMessage = settled.attempt.error ??
+                `Update attempt ${settled.attempt.attemptId} requires operator recovery (phase: ${settled.attempt.phase})`;
+            this.logger.error(recoveryMessage);
+            await this.failUpdate(recoveryMessage);
+            return;
+        }
+        if (settled.status) {
+            await this.processPendingStatus(settled.status);
+            this.cleanupPendingStatus();
+            this.updateService.releaseUpdateLock();
+        }
+    }
     async checkPendingUpdateStatus() {
+        const attemptBeforeStatus = this.readAttempt();
         if (!(0, fs_1.existsSync)(STATUS_FILE)) {
+            if (attemptBeforeStatus?.state === 'complete') {
+                await this.reconcileCompletedAttempt(attemptBeforeStatus);
+                this.updateService.releaseUpdateLock();
+                return;
+            }
+            if (this.isAttemptUnresolved(attemptBeforeStatus)) {
+                if (attemptBeforeStatus.state === 'active' && this.isAttemptOwnerAlive(attemptBeforeStatus)) {
+                    await this.reconcileLiveAttempt(attemptBeforeStatus);
+                    return;
+                }
+                await this.failUpdate(attemptBeforeStatus.error ??
+                    `Update attempt ${attemptBeforeStatus.attemptId} requires operator recovery (phase: ${attemptBeforeStatus.phase})`);
+            }
             return;
         }
         try {
-            const raw = (0, fs_1.readFileSync)(STATUS_FILE, 'utf-8');
-            const status = JSON.parse(raw);
-            if (status.status === system_constants_1.UpdateStatusType.COMPLETE) {
-                this.logger.log(`Update to ${status.targetVersion} completed successfully`);
-                this.updateService.setStatus({
-                    status: system_constants_1.UpdateStatusType.COMPLETE,
-                    phase: system_constants_1.UpdatePhase.COMPLETE,
-                    progressPercent: 100,
-                    message: `Successfully updated to ${status.targetVersion}`,
-                    error: null,
-                });
-                await this.reportUpdateSucceeded();
-            }
-            else if (status.status === system_constants_1.UpdateStatusType.FAILED) {
-                this.logger.error(`Update to ${status.targetVersion} failed: ${status.error ?? 'unknown error'}`);
-                await this.failUpdate(status.error ?? 'Update failed with unknown error');
+            const status = this.readStatusFile();
+            const attempt = this.readAttempt();
+            if (attempt?.state === 'complete') {
+                await this.reconcileCompletedAttempt(attempt, status);
+                this.updateService.releaseUpdateLock();
+                return;
             }
-            else {
-                const startedAt = new Date(status.startedAt).getTime();
-                if (Date.now() - startedAt > UPDATE_TIMEOUT_MS) {
-                    this.logger.error(`Update to ${status.targetVersion} timed out`);
-                    await this.failUpdate('Update timed out after 10 minutes');
+            if (!status) {
+                if (this.isAttemptUnresolved(attempt)) {
+                    if (attempt.state === 'active' && this.isAttemptOwnerAlive(attempt)) {
+                        await this.reconcileLiveAttempt(attempt);
+                        return;
+                    }
+                    await this.failUpdate(attempt.error ?? `Update attempt ${attempt.attemptId} requires operator recovery (phase: ${attempt.phase})`);
                 }
-                else {
-                    this.logger.warn(`Update to ${status.targetVersion} was in progress (phase: ${status.phase}), service restarted`);
-                    await this.failUpdate(`Update interrupted during ${status.phase} phase`);
+                return;
+            }
+            if (this.isAttemptUnresolved(attempt)) {
+                if (attempt.state === 'active' && this.isAttemptOwnerAlive(attempt)) {
+                    this.logger.log(`Update attempt ${attempt.attemptId} remains owned by worker ${attempt.ownerPid} (phase: ${attempt.phase}); waiting for durable settlement`);
+                    await this.reconcileLiveAttempt(attempt);
+                    return;
                 }
+                const recoveryMessage = attempt.error ?? `Update attempt ${attempt.attemptId} requires operator recovery (phase: ${attempt.phase})`;
+                this.logger.error(recoveryMessage);
+                await this.failUpdate(recoveryMessage);
+                return;
             }
-            (0, fs_1.unlinkSync)(STATUS_FILE);
+            await this.processPendingStatus(status);
+            this.cleanupPendingStatus();
         }
         catch (error) {
             const err = error;
@@ -101,7 +208,45 @@ let UpdateExecutorService = class UpdateExecutorService {
         }
         this.updateService.releaseUpdateLock();
     }
+    async processPendingStatus(status) {
+        if (status.status === system_constants_1.UpdateStatusType.COMPLETE) {
+            this.logger.log(`Update to ${status.targetVersion} completed successfully`);
+            this.updateService.setStatus({
+                status: system_constants_1.UpdateStatusType.COMPLETE,
+                phase: system_constants_1.UpdatePhase.COMPLETE,
+                progressPercent: 100,
+                message: `Successfully updated to ${status.targetVersion}`,
+                error: null,
+            });
+            await this.reportUpdateSucceeded();
+        }
+        else if (status.status === system_constants_1.UpdateStatusType.FAILED) {
+            this.logger.error(`Update to ${status.targetVersion} failed: ${status.error ?? 'unknown error'}`);
+            await this.failUpdate(status.error ?? 'Update failed with unknown error');
+        }
+        else {
+            const startedAt = new Date(status.startedAt).getTime();
+            if (Date.now() - startedAt > UPDATE_TIMEOUT_MS) {
+                this.logger.error(`Update to ${status.targetVersion} timed out`);
+                await this.failUpdate('Update timed out after 10 minutes');
+            }
+            else {
+                this.logger.warn(`Update to ${status.targetVersion} was in progress (phase: ${status.phase}), service restarted`);
+                await this.failUpdate(`Update interrupted during ${status.phase} phase`);
+            }
+        }
+    }
+    cleanupPendingStatus() {
+        if (!(0, fs_1.existsSync)(STATUS_FILE)) {
+            return;
+        }
+        (0, fs_1.unlinkSync)(STATUS_FILE);
+    }
     async startUpdate(targetVersion) {
+        const attempt = this.readAttempt();
+        if (this.isAttemptUnresolved(attempt)) {
+            throw new Error(`An earlier update attempt (${attempt.attemptId}) requires recovery before another update can start`);
+        }
         if (!this.updateService.acquireUpdateLock()) {
             throw new Error('An update is already in progress');
         }

package/dist/modules/system/services/update-executor.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-executor.service.js","sourceRoot":"","sources":["../../../../src/modules/system/services/update-executor.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update-executor.service.js","sourceRoot":"","sources":["../../../../src/modules/system/services/update-executor.service.ts"],"names":[],"mappings":"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"}

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) {
@@ -61,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([
@@ -70,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":"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"}
+{"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/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,5 +1,6 @@
 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;
@@ -24,10 +25,17 @@ export interface PropertyEventListener {
     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/services/homekit-mapper-registry.service.d.ts

@@ -1,10 +1,11 @@
 import { Accessory } from '@homebridge/hap-nodejs';
 import { DeviceEntity } from '../../../modules/devices/entities/devices.entity';
-import { CharacteristicBinding, IHomeKitAccessoryMapper, PropertyEventListener } from '../mappers/homekit-mapper.interface';
+import { CharacteristicBinding, IHomeKitAccessoryMapper, InputOccurrenceListener, PropertyEventListener } from '../mappers/homekit-mapper.interface';
 import { HomeKitCommandDispatcher } from './homekit-command.dispatcher';
 export interface RegistrySnapshot {
     propertyBindings: Map<string, CharacteristicBinding[]>;
     propertyListeners: Map<string, PropertyEventListener[]>;
+    occurrenceListeners: Map<string, InputOccurrenceListener[]>;
     deviceProperties: Map<string, Set<string>>;
 }
 export interface StagedAccessory {
@@ -12,12 +13,14 @@ export interface StagedAccessory {
     deviceId: string;
     bindings: CharacteristicBinding[];
     listeners: PropertyEventListener[];
+    occurrenceListeners: InputOccurrenceListener[];
 }
 export declare class HomeKitMapperRegistryService {
     private readonly logger;
     private readonly mappers;
     private readonly propertyBindings;
     private readonly propertyListeners;
+    private readonly occurrenceListeners;
     private readonly deviceProperties;
     constructor();
     canMap(device: DeviceEntity): boolean;
@@ -27,6 +30,7 @@ export declare class HomeKitMapperRegistryService {
     commitStaged(staged: StagedAccessory): void;
     getBindingsForProperty(propertyId: string): CharacteristicBinding[];
     getListenersForProperty(propertyId: string): PropertyEventListener[];
+    getOccurrenceListeners(propertyId: string, _channelId?: string): InputOccurrenceListener[];
     clearDeviceBindings(deviceId: string): void;
     clearAllBindings(): void;
     getSnapshot(): RegistrySnapshot;