homebridge-config-ui-x 5.9.1-beta.1 → 5.9.1-beta.10

package/dist/modules/accessories/accessories.module.js

@@ -1,39 +1,38 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AccessoriesModule = void 0;
-const common_1 = require("@nestjs/common");
-const passport_1 = require("@nestjs/passport");
-const config_module_1 = require("../../core/config/config.module");
-const logger_module_1 = require("../../core/logger/logger.module");
-const accessories_controller_1 = require("./accessories.controller");
-const accessories_gateway_1 = require("./accessories.gateway");
-const accessories_service_1 = require("./accessories.service");
+import { Module } from '@nestjs/common';
+import { PassportModule } from '@nestjs/passport';
+import { ConfigModule } from '../../core/config/config.module.js';
+import { HomebridgeIpcModule } from '../../core/homebridge-ipc/homebridge-ipc.module.js';
+import { LoggerModule } from '../../core/logger/logger.module.js';
+import { AccessoriesController } from './accessories.controller.js';
+import { AccessoriesGateway } from './accessories.gateway.js';
+import { AccessoriesService } from './accessories.service.js';
 let AccessoriesModule = class AccessoriesModule {
 };
-exports.AccessoriesModule = AccessoriesModule;
-exports.AccessoriesModule = AccessoriesModule = __decorate([
-    (0, common_1.Module)({
+AccessoriesModule = __decorate([
+    Module({
         imports: [
-            passport_1.PassportModule.register({ defaultStrategy: 'jwt' }),
-            config_module_1.ConfigModule,
-            logger_module_1.LoggerModule,
+            PassportModule.register({ defaultStrategy: 'jwt' }),
+            ConfigModule,
+            LoggerModule,
+            HomebridgeIpcModule,
         ],
         providers: [
-            accessories_service_1.AccessoriesService,
-            accessories_gateway_1.AccessoriesGateway,
+            AccessoriesService,
+            AccessoriesGateway,
         ],
         exports: [
-            accessories_service_1.AccessoriesService,
+            AccessoriesService,
         ],
         controllers: [
-            accessories_controller_1.AccessoriesController,
+            AccessoriesController,
         ],
     })
 ], AccessoriesModule);
+export { AccessoriesModule };
 //# sourceMappingURL=accessories.module.js.map

package/dist/modules/accessories/accessories.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"accessories.module.js","sourceRoot":"","sources":["../../../src/modules/accessories/accessories.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAuC;AACvC,+CAAiD;AAEjD,mEAA8D;AAC9D,mEAA8D;AAC9D,qEAAgE;AAChE,+DAA0D;AAC1D,+DAA0D;AAmBnD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;CAAG,CAAA;AAApB,8CAAiB;4BAAjB,iBAAiB;IAjB7B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,yBAAc,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC;YACnD,4BAAY;YACZ,4BAAY;SACb;QACD,SAAS,EAAE;YACT,wCAAkB;YAClB,wCAAkB;SACnB;QACD,OAAO,EAAE;YACP,wCAAkB;SACnB;QACD,WAAW,EAAE;YACX,8CAAqB;SACtB;KACF,CAAC;GACW,iBAAiB,CAAG"}
+{"version":3,"file":"accessories.module.js","sourceRoot":"","sources":["../../../src/modules/accessories/accessories.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oDAAoD,CAAA;AACxF,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAoBtD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;CAAG,CAAA;AAApB,iBAAiB;IAlB7B,MAAM,CAAC;QACN,OAAO,EAAE;YACP,cAAc,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC;YACnD,YAAY;YACZ,YAAY;YACZ,mBAAmB;SACpB;QACD,SAAS,EAAE;YACT,kBAAkB;YAClB,kBAAkB;SACnB;QACD,OAAO,EAAE;YACP,kBAAkB;SACnB;QACD,WAAW,EAAE;YACX,qBAAqB;SACtB;KACF,CAAC;GACW,iBAAiB,CAAG"}

package/dist/modules/accessories/accessories.service.d.ts

@@ -1,20 +1,38 @@
 import type { ServiceType } from '@homebridge/hap-client';
+import type { Socket } from 'socket.io';
+import type { MatterService } from './accessories.interfaces.js';
 import { HapClient } from '@homebridge/hap-client';
 import NodeCache from 'node-cache';
-import { ConfigService } from '../../core/config/config.service';
-import { Logger } from '../../core/logger/logger.service';
+import { ConfigService } from '../../core/config/config.service.js';
+import { HomebridgeIpcService } from '../../core/homebridge-ipc/homebridge-ipc.service.js';
+import { Logger } from '../../core/logger/logger.service.js';
 export declare class AccessoriesService {
     private readonly configService;
     private readonly logger;
+    private readonly homebridgeIpcService;
     hapClient: HapClient;
     accessoriesCache: NodeCache;
-    constructor(configService: ConfigService, logger: Logger);
-    connect(client: any): Promise<void>;
+    private matterMonitoringActive;
+    private matterUpdateListener;
+    private activeClients;
+    private matterAccessories;
+    constructor(configService: ConfigService, logger: Logger, homebridgeIpcService: HomebridgeIpcService);
+    connect(client: Socket): Promise<void>;
     private refreshCharacteristics;
     loadAccessories(): Promise<ServiceType[]>;
-    getAccessory(uniqueId: string): Promise<ServiceType>;
+    getAccessory(uniqueId: string): Promise<MatterService | ServiceType>;
+    private getMatterAccessory;
     setAccessoryCharacteristic(uniqueId: string, characteristicType: string, value: number | boolean | string): Promise<ServiceType>;
     getAccessoryLayout(username: string): Promise<any>;
     saveAccessoryLayout(user: string, layout: Record<string, unknown>): Promise<Record<string, unknown>>;
     resetInstancePool(): void;
+    private parseMatterUniqueId;
+    private buildMatterUniqueId;
+    private waitForMatterEvent;
+    private startMatterMonitoring;
+    private stopMatterMonitoring;
+    private loadMatterAccessories;
+    private transformMatterAccessory;
+    private handleMatterStateUpdate;
+    private handleMatterControl;
 }

package/dist/modules/accessories/accessories.service.js

@@ -1,4 +1,3 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -8,25 +7,33 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AccessoriesService = void 0;
-const node_path_1 = require("node:path");
-const hap_client_1 = require("@homebridge/hap-client");
-const common_1 = require("@nestjs/common");
-const fs_extra_1 = require("fs-extra");
-const node_cache_1 = __importDefault(require("node-cache"));
-const config_service_1 = require("../../core/config/config.service");
-const logger_service_1 = require("../../core/logger/logger.service");
+import { join } from 'node:path';
+import { HapClient } from '@homebridge/hap-client';
+import { BadRequestException, Inject, Injectable } from '@nestjs/common';
+import { mkdirp, pathExists, readJson, writeJsonSync } from 'fs-extra/esm';
+import NodeCache from 'node-cache';
+import { ConfigService } from '../../core/config/config.service.js';
+import { HomebridgeIpcService } from '../../core/homebridge-ipc/homebridge-ipc.service.js';
+import { Logger } from '../../core/logger/logger.service.js';
 let AccessoriesService = class AccessoriesService {
-    constructor(configService, logger) {
+    configService;
+    logger;
+    homebridgeIpcService;
+    hapClient;
+    accessoriesCache = new NodeCache({ stdTTL: 0 });
+    matterMonitoringActive = false;
+    matterUpdateListener = null;
+    activeClients = new Set();
+    matterAccessories = [];
+    constructor(configService, logger, homebridgeIpcService) {
         this.configService = configService;
         this.logger = logger;
-        this.accessoriesCache = new node_cache_1.default({ stdTTL: 0 });
+        this.homebridgeIpcService = homebridgeIpcService;
         if (this.configService.homebridgeInsecureMode) {
-            this.hapClient = new hap_client_1.HapClient({
+            this.hapClient = new HapClient({
                 pin: this.configService.homebridgeConfig.bridge.pin,
                 logger: this.logger,
                 config: this.configService.ui.accessoryControl || {},
@@ -38,6 +45,10 @@ let AccessoriesService = class AccessoriesService {
             this.logger.error('Homebridge must be running in insecure mode to control accessories.');
             return;
         }
+        this.activeClients.add(client);
+        if (this.activeClients.size === 1) {
+            await this.startMatterMonitoring();
+        }
         let services;
         const loadAllAccessories = async (refresh) => {
             if (!refresh) {
@@ -46,26 +57,48 @@ let AccessoriesService = class AccessoriesService {
                     client.emit('accessories-data', cached);
                 }
             }
-            services = await this.loadAccessories();
-            this.refreshCharacteristics(services);
+            const hapServices = await this.loadAccessories();
+            this.refreshCharacteristics(hapServices);
+            client.emit('hap-accessories-ready-for-control');
+            client.emit('accessories-data', hapServices);
+            const matterServices = await this.loadMatterAccessories();
+            client.emit('matter-accessories-ready-for-control');
+            if (matterServices.length > 0) {
+                client.emit('accessories-data', matterServices);
+            }
+            services = [...hapServices, ...matterServices];
             client.emit('accessories-ready-for-control');
-            client.emit('accessories-data', services);
             this.accessoriesCache.set('services', services);
         };
         await loadAllAccessories(false);
         const requestHandler = async (msg) => {
-            if (msg.set) {
-                const service = services.find(x => x.uniqueId === msg.set.uniqueId);
-                if (service) {
-                    try {
-                        await service.setCharacteristic(msg.set.iid, msg.set.value);
-                        services = await this.loadAccessories();
-                        setTimeout(() => {
-                            this.refreshCharacteristics(services);
-                        }, 1500);
+            if (msg.refresh) {
+                await loadAllAccessories(true);
+            }
+            else if (msg.set) {
+                if (msg.set.uniqueId && msg.set.uniqueId.startsWith('matter:')) {
+                    if (msg.set.cluster && msg.set.attributes) {
+                        await this.handleMatterControl(client, {
+                            uniqueId: msg.set.uniqueId,
+                            cluster: msg.set.cluster,
+                            attributes: msg.set.attributes,
+                        });
                     }
-                    catch (e) {
-                        client.emit('accessory-control-failure', e.message);
+                }
+                else {
+                    const service = services.find(x => x.uniqueId === msg.set.uniqueId);
+                    if (service && 'serviceCharacteristics' in service) {
+                        try {
+                            await service.setCharacteristic(msg.set.iid, msg.set.value);
+                            const hapServices = await this.loadAccessories();
+                            setTimeout(() => {
+                                this.refreshCharacteristics(hapServices);
+                            }, 1500);
+                            services = [...hapServices, ...this.matterAccessories];
+                        }
+                        catch (e) {
+                            client.emit('accessory-control-failure', e.message);
+                        }
                     }
                 }
             }
@@ -76,7 +109,7 @@ let AccessoriesService = class AccessoriesService {
             client.emit('accessories-data', data);
         };
         monitor.on('service-update', updateHandler);
-        const instanceUpdateHandler = async (data) => {
+        const instanceUpdateHandler = async () => {
             client.emit('accessories-reload-required', services);
         };
         this.hapClient.on('instance-discovered', instanceUpdateHandler);
@@ -91,6 +124,10 @@ let AccessoriesService = class AccessoriesService {
             monitor.removeAllListeners('service-update');
             monitor.finish();
             this.hapClient.removeListener('instance-discovered', instanceUpdateHandler);
+            this.activeClients.delete(client);
+            if (this.activeClients.size === 0) {
+                this.stopMatterMonitoring();
+            }
         };
         client.on('disconnect', onEnd.bind(this));
         client.on('end', onEnd.bind(this));
@@ -105,7 +142,7 @@ let AccessoriesService = class AccessoriesService {
     }
     async loadAccessories() {
         if (!this.configService.homebridgeInsecureMode) {
-            throw new common_1.BadRequestException('Homebridge must be running in insecure mode to access accessories.');
+            throw new BadRequestException('Homebridge must be running in insecure mode to access accessories.');
         }
         try {
             return await this.hapClient.getAllServices();
@@ -121,46 +158,72 @@ let AccessoriesService = class AccessoriesService {
         }
     }
     async getAccessory(uniqueId) {
+        if (uniqueId.startsWith('matter:')) {
+            return this.getMatterAccessory(uniqueId);
+        }
         const services = await this.loadAccessories();
         const service = services.find(x => x.uniqueId === uniqueId);
         if (!service) {
-            throw new common_1.BadRequestException(`Service with uniqueId of '${uniqueId}' not found.`);
+            throw new BadRequestException(`Service with uniqueId of '${uniqueId}' not found.`);
         }
         try {
             await service.refreshCharacteristics();
             return service;
         }
         catch (e) {
-            throw new common_1.BadRequestException(e.message);
+            throw new BadRequestException(e.message);
+        }
+    }
+    async getMatterAccessory(uniqueId) {
+        try {
+            const { uuid, partId } = this.parseMatterUniqueId(uniqueId);
+            const response = await this.waitForMatterEvent('accessoryInfo', () => {
+                this.homebridgeIpcService.sendMessage('getMatterAccessoryInfo', { uuid });
+            });
+            if (response.error) {
+                throw new BadRequestException(response.error);
+            }
+            if (partId) {
+                const part = response.parts?.find((p) => p.id === partId);
+                if (part) {
+                    return this.transformMatterAccessory(response, part);
+                }
+                throw new BadRequestException(`Part '${partId}' not found in accessory`);
+            }
+            return this.transformMatterAccessory(response);
+        }
+        catch (error) {
+            this.logger.error(`Failed to get Matter accessory info for ${uniqueId}:`, error);
+            throw new BadRequestException(error.message || 'Failed to get Matter accessory info');
         }
     }
     async setAccessoryCharacteristic(uniqueId, characteristicType, value) {
         const services = await this.loadAccessories();
         const service = services.find(x => x.uniqueId === uniqueId);
         if (!service) {
-            throw new common_1.BadRequestException(`Service with uniqueId of '${uniqueId}' not found.`);
+            throw new BadRequestException(`Service with uniqueId of '${uniqueId}' not found.`);
         }
         const characteristic = service.getCharacteristic(characteristicType);
         if (!characteristic || !characteristic.canWrite) {
             const types = service.serviceCharacteristics.filter(x => x.canWrite).map(x => `'${x.type}'`).join(', ');
-            throw new common_1.BadRequestException(`Invalid characteristicType. Valid types are: ${types}.`);
+            throw new BadRequestException(`Invalid characteristicType. Valid types are: ${types}.`);
         }
         if (['uint8', 'uint16', 'uint32', 'uint64'].includes(characteristic.format)) {
             value = Number.parseInt(value, 10);
             if (characteristic.minValue !== undefined && value < characteristic.minValue) {
-                throw new common_1.BadRequestException(`Invalid value. The value must be between ${characteristic.minValue} and ${characteristic.maxValue}.`);
+                throw new BadRequestException(`Invalid value. The value must be between ${characteristic.minValue} and ${characteristic.maxValue}.`);
             }
             if (characteristic.maxValue !== undefined && value > characteristic.maxValue) {
-                throw new common_1.BadRequestException(`Invalid value. The value must be between ${characteristic.minValue} and ${characteristic.maxValue}.`);
+                throw new BadRequestException(`Invalid value. The value must be between ${characteristic.minValue} and ${characteristic.maxValue}.`);
             }
         }
         if (characteristic.format === 'float') {
             value = Number.parseFloat(value);
             if (characteristic.minValue !== undefined && value < characteristic.minValue) {
-                throw new common_1.BadRequestException(`Invalid value. The value must be between ${characteristic.minValue} and ${characteristic.maxValue}.`);
+                throw new BadRequestException(`Invalid value. The value must be between ${characteristic.minValue} and ${characteristic.maxValue}.`);
             }
             if (characteristic.maxValue !== undefined && value > characteristic.maxValue) {
-                throw new common_1.BadRequestException(`Invalid value. The value must be between ${characteristic.minValue} and ${characteristic.maxValue}.`);
+                throw new BadRequestException(`Invalid value. The value must be between ${characteristic.minValue} and ${characteristic.maxValue}.`);
             }
         }
         if (characteristic.format === 'bool') {
@@ -176,7 +239,7 @@ let AccessoriesService = class AccessoriesService {
                 value = value === 1;
             }
             if (typeof value !== 'boolean') {
-                throw new common_1.BadRequestException('Invalid value. The value must be a boolean (true or false).');
+                throw new BadRequestException('Invalid value. The value must be a boolean (true or false).');
             }
         }
         try {
@@ -185,12 +248,12 @@ let AccessoriesService = class AccessoriesService {
             return service;
         }
         catch (e) {
-            throw new common_1.BadRequestException(e.message);
+            throw new BadRequestException(e.message);
         }
     }
     async getAccessoryLayout(username) {
         try {
-            const accessoryLayout = await (0, fs_extra_1.readJson)(this.configService.accessoryLayoutPath);
+            const accessoryLayout = await readJson(this.configService.accessoryLayoutPath);
             if (username in accessoryLayout) {
                 return accessoryLayout[username];
             }
@@ -210,16 +273,16 @@ let AccessoriesService = class AccessoriesService {
     async saveAccessoryLayout(user, layout) {
         let accessoryLayout;
         try {
-            accessoryLayout = await (0, fs_extra_1.readJson)(this.configService.accessoryLayoutPath);
+            accessoryLayout = await readJson(this.configService.accessoryLayoutPath);
         }
         catch (e) {
             accessoryLayout = {};
         }
-        if (!await (0, fs_extra_1.pathExists)((0, node_path_1.join)(this.configService.storagePath, 'accessories'))) {
-            await (0, fs_extra_1.mkdirp)((0, node_path_1.join)(this.configService.storagePath, 'accessories'));
+        if (!await pathExists(join(this.configService.storagePath, 'accessories'))) {
+            await mkdirp(join(this.configService.storagePath, 'accessories'));
         }
         accessoryLayout[user] = layout;
-        (0, fs_extra_1.writeJsonSync)(this.configService.accessoryLayoutPath, accessoryLayout);
+        writeJsonSync(this.configService.accessoryLayoutPath, accessoryLayout);
         this.logger.log(`Accessory layout changes saved for ${user}.`);
         return layout;
     }
@@ -228,11 +291,213 @@ let AccessoriesService = class AccessoriesService {
             this.hapClient.resetInstancePool();
         }
     }
+    parseMatterUniqueId(uniqueId) {
+        const parts = uniqueId.replace('matter:', '').split(':');
+        return {
+            uuid: parts[0],
+            partId: parts[1],
+        };
+    }
+    buildMatterUniqueId(uuid, partId) {
+        return partId ? `matter:${uuid}:${partId}` : `matter:${uuid}`;
+    }
+    async waitForMatterEvent(eventType, sendRequest) {
+        return new Promise((resolve, reject) => {
+            const actionTimeout = setTimeout(() => {
+                this.homebridgeIpcService.removeListener('matterEvent', listener);
+                reject(new Error('The Homebridge service did not respond'));
+            }, 3000);
+            const listener = (event) => {
+                if (event.type === eventType) {
+                    clearTimeout(actionTimeout);
+                    this.homebridgeIpcService.removeListener('matterEvent', listener);
+                    resolve(event.data);
+                }
+            };
+            this.homebridgeIpcService.on('matterEvent', listener);
+            sendRequest();
+        });
+    }
+    async startMatterMonitoring() {
+        if (this.matterMonitoringActive) {
+            return;
+        }
+        try {
+            this.logger.debug('Starting Matter accessory monitoring');
+            this.homebridgeIpcService.sendMessage('startMatterMonitoring');
+            this.matterMonitoringActive = true;
+            this.matterUpdateListener = (event) => {
+                switch (event.type) {
+                    case 'accessoryUpdate':
+                        if (event.data && 'uuid' in event.data && 'cluster' in event.data) {
+                            this.handleMatterStateUpdate(event.data);
+                        }
+                        break;
+                    case 'accessoryAdded':
+                    case 'accessoryRemoved':
+                        if (event.data && 'uuid' in event.data) {
+                            this.logger.debug(`Matter accessory ${event.type}: ${event.data.uuid} - triggering reload`);
+                        }
+                        for (const client of this.activeClients) {
+                            client.emit('matter-accessories-reload-required');
+                        }
+                        break;
+                }
+            };
+            this.homebridgeIpcService.on('matterEvent', this.matterUpdateListener);
+            this.logger.debug('Matter monitoring started successfully');
+        }
+        catch (error) {
+            this.logger.error('Failed to start Matter monitoring:', error);
+        }
+    }
+    async stopMatterMonitoring() {
+        if (!this.matterMonitoringActive) {
+            return;
+        }
+        try {
+            this.logger.debug('Stopping Matter accessory monitoring');
+            if (this.matterUpdateListener) {
+                this.homebridgeIpcService.removeListener('matterEvent', this.matterUpdateListener);
+                this.matterUpdateListener = null;
+            }
+            this.homebridgeIpcService.sendMessage('stopMatterMonitoring');
+            this.matterMonitoringActive = false;
+            this.matterAccessories = [];
+            this.logger.debug('Matter monitoring stopped');
+        }
+        catch (error) {
+            this.logger.error('Failed to stop Matter monitoring:', error);
+        }
+    }
+    async loadMatterAccessories() {
+        if (!this.matterMonitoringActive) {
+            this.logger.warn('Matter monitoring not active, skipping accessory load');
+            return [];
+        }
+        try {
+            const response = await this.waitForMatterEvent('accessoriesData', () => {
+                this.homebridgeIpcService.sendMessage('getMatterAccessories', {});
+            });
+            if (response.error) {
+                throw new Error(response.error);
+            }
+            const accessories = response.accessories || [];
+            this.logger.debug(`Loaded ${accessories.length} Matter accessories from IPC`);
+            const matterServices = accessories.flatMap((accessory) => {
+                const services = [];
+                services.push({
+                    ...this.transformMatterAccessory(accessory),
+                    protocol: 'matter',
+                });
+                if (accessory.parts) {
+                    for (const part of accessory.parts) {
+                        services.push({
+                            ...this.transformMatterAccessory(accessory, part),
+                            protocol: 'matter',
+                        });
+                    }
+                }
+                return services;
+            });
+            this.logger.debug(`Transformed ${matterServices.length} Matter services (including parts)`);
+            this.matterAccessories = matterServices;
+            return matterServices;
+        }
+        catch (error) {
+            this.logger.error('Failed to load Matter accessories:', error);
+            return [];
+        }
+    }
+    transformMatterAccessory(accessory, part) {
+        const targetClusters = part?.clusters || accessory.clusters;
+        const displayName = part
+            ? `${accessory.displayName} - ${part.displayName}`
+            : accessory.displayName;
+        const uniqueId = part
+            ? `matter:${accessory.uuid}:${part.id}`
+            : `matter:${accessory.uuid}`;
+        const deviceType = part?.deviceType || accessory.deviceType;
+        const bridgeUsername = accessory.bridge?.username || 'unknown';
+        if (bridgeUsername === 'unknown') {
+            this.logger.warn(`Matter accessory '${displayName}' (${uniqueId}) has no bridge.username - layout may not persist correctly`);
+        }
+        return {
+            uniqueId,
+            uuid: accessory.uuid,
+            serviceName: displayName,
+            displayName,
+            deviceType,
+            clusters: targetClusters,
+            partId: part?.id,
+            protocol: 'matter',
+            instance: {
+                name: accessory.bridge?.name || 'Matter Bridge',
+                username: bridgeUsername,
+            },
+            accessoryInformation: {
+                'Name': displayName,
+                'Manufacturer': accessory.manufacturer || 'Unknown',
+                'Model': accessory.model || deviceType,
+                'Serial Number': accessory.serialNumber || accessory.uuid,
+                'Firmware Revision': accessory.firmwareRevision || '1.0.0',
+            },
+            bridge: accessory.bridge,
+            plugin: accessory.plugin,
+            platform: accessory.platform,
+            commissioned: accessory.commissioned,
+            fabricCount: accessory.fabricCount,
+            fabrics: accessory.fabrics,
+            aid: 0,
+            iid: 0,
+        };
+    }
+    handleMatterStateUpdate(data) {
+        const uniqueId = this.buildMatterUniqueId(data.uuid, data.partId);
+        const service = this.matterAccessories.find(s => s.uniqueId === uniqueId);
+        if (!service) {
+            return;
+        }
+        service.clusters[data.cluster] = {
+            ...service.clusters[data.cluster],
+            ...data.state,
+        };
+        for (const client of this.activeClients) {
+            client.emit('accessories-data', [service]);
+        }
+    }
+    async handleMatterControl(client, control) {
+        try {
+            const { uuid, partId } = this.parseMatterUniqueId(control.uniqueId);
+            const accessory = this.matterAccessories.find(acc => acc.uuid === uuid);
+            const bridgeUsername = accessory?.bridge?.username;
+            const response = await this.waitForMatterEvent('accessoryControlResponse', () => {
+                this.homebridgeIpcService.sendMessage('matterAccessoryControl', {
+                    uuid,
+                    cluster: control.cluster,
+                    attributes: control.attributes,
+                    bridgeUsername,
+                    partId,
+                });
+            });
+            if (!response.success) {
+                client.emit('accessory-control-failure', response.error || 'Matter control failed');
+            }
+        }
+        catch (error) {
+            this.logger.error('Matter control failed:', error);
+            client.emit('accessory-control-failure', error.message || 'Matter control failed');
+        }
+    }
 };
-exports.AccessoriesService = AccessoriesService;
-exports.AccessoriesService = AccessoriesService = __decorate([
-    (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [config_service_1.ConfigService,
-        logger_service_1.Logger])
+AccessoriesService = __decorate([
+    Injectable(),
+    __param(0, Inject(ConfigService)),
+    __param(1, Inject(Logger)),
+    __param(2, Inject(HomebridgeIpcService)),
+    __metadata("design:paramtypes", [ConfigService,
+        Logger,
+        HomebridgeIpcService])
 ], AccessoriesService);
+export { AccessoriesService };
 //# sourceMappingURL=accessories.service.js.map