homebridge 2.0.0-beta.34 → 2.0.0-beta.36

package/dist/index.js

@@ -6,12 +6,12 @@ export { APIEvent, PluginType } from './api.js';
  * Export Logger const enums
  */
 export { LogLevel } from './logger.js';
-export { ChildMatterMessageType, MatterBridgeStatus } from './matter/matterSharedTypes.js';
+export { ChildMatterMessageType, MatterBridgeStatus } from './matter/sharedTypes.js';
 /**
  * Matter device types, clusters, and cluster names
  * Access via api.matter.deviceTypes, api.matter.clusters, api.matter.clusterNames
  */
-export { clusterNames, clusters, devices, deviceTypes, MatterAccessoryEventTypes } from './matter/matterTypes.js';
+export { clusterNames, clusters, devices, deviceTypes, MatterAccessoryEventTypes } from './matter/types.js';
 /**
  * ═══════════════════════════════════════════════════════════════════════
  * Matter Protocol - UI Integration Types
@@ -20,7 +20,7 @@ export { clusterNames, clusters, devices, deviceTypes, MatterAccessoryEventTypes
 /**
  * Matter error types for error handling
  */
-export { MatterCommissioningError, MatterDeviceError, MatterError, MatterErrorType, MatterNetworkError, MatterStorageError, } from './matter/matterTypes.js';
+export { MatterCommissioningError, MatterDeviceError, MatterError, MatterErrorType, MatterNetworkError, MatterStorageError, } from './matter/types.js';
 /**
  * Export Platform Accessory const enums
  */

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AA8BA;;GAEG;AACH,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAiB/C;;GAEG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AA2CtC,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAa1F;;;GAGG;AACH,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAA;AAEjH;;;;GAIG;AAEH;;GAEG;AACH,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EACjB,WAAW,EACX,eAAe,EACf,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,yBAAyB,CAAA;AAIhC;;GAEG;AACH,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAiB/D;;;;GAIG;AACH,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,WAAW,EACX,mBAAmB,EACnB,gCAAgC,EAChC,8BAA8B,EAC9B,YAAY,EACZ,eAAe,EACf,uBAAuB,EACvB,wBAAwB,EACxB,eAAe,EACf,uBAAuB,EACvB,wBAAwB,EACxB,WAAW,EACX,UAAU,EACV,sBAAsB,EACtB,UAAU,EACV,YAAY,EACZ,wBAAwB,EACxB,cAAc,EACd,yBAAyB,EACzB,qBAAqB,EACrB,gBAAgB,EAChB,qBAAqB,EACrB,kBAAkB,EAClB,OAAO,EACP,SAAS,EACT,WAAW,EACX,mBAAmB,EACnB,SAAS,EACT,8BAA8B,EAC9B,SAAS,EACT,kBAAkB,EAClB,cAAc,EACd,KAAK,EACL,SAAS,EACT,sBAAsB,EACtB,qBAAqB,EACrB,iBAAiB,EACjB,sBAAsB,EACtB,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACd,aAAa,EACb,MAAM,EACN,KAAK,GACN,MAAM,YAAY,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AA8BA;;GAEG;AACH,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAiB/C;;GAEG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AA2CtC,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAapF;;;GAGG;AACH,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAA;AAE3G;;;;GAIG;AAEH;;GAEG;AACH,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EACjB,WAAW,EACX,eAAe,EACf,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,mBAAmB,CAAA;AAI1B;;GAEG;AACH,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAiB/D;;;;GAIG;AACH,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,WAAW,EACX,mBAAmB,EACnB,gCAAgC,EAChC,8BAA8B,EAC9B,YAAY,EACZ,eAAe,EACf,uBAAuB,EACvB,wBAAwB,EACxB,eAAe,EACf,uBAAuB,EACvB,wBAAwB,EACxB,WAAW,EACX,UAAU,EACV,sBAAsB,EACtB,UAAU,EACV,YAAY,EACZ,wBAAwB,EACxB,cAAc,EACd,yBAAyB,EACzB,qBAAqB,EACrB,gBAAgB,EAChB,qBAAqB,EACrB,kBAAkB,EAClB,OAAO,EACP,SAAS,EACT,WAAW,EACX,mBAAmB,EACnB,SAAS,EACT,8BAA8B,EAC9B,SAAS,EACT,kBAAkB,EAClB,cAAc,EACd,KAAK,EACL,SAAS,EACT,sBAAsB,EACtB,qBAAqB,EACrB,iBAAiB,EACjB,sBAAsB,EACtB,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACd,aAAa,EACb,MAAM,EACN,KAAK,GACN,MAAM,YAAY,CAAA"}

package/dist/logger.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=logger.spec.d.ts.map

package/dist/logger.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.spec.d.ts","sourceRoot":"","sources":["../src/logger.spec.ts"],"names":[],"mappings":""}

package/dist/logger.spec.js

@@ -0,0 +1,95 @@
+import chalk from 'chalk';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { Logger } from './logger.js';
+describe('logger', () => {
+    let consoleLogSpy;
+    let consoleErrorSpy;
+    beforeEach(() => {
+        consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+        consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => { });
+    });
+    afterEach(() => {
+        consoleLogSpy.mockRestore();
+        consoleErrorSpy.mockRestore();
+    });
+    it('should create a new logger with a prefix', () => {
+        const logger = Logger.withPrefix('test');
+        expect(logger.prefix).toBe('test');
+    });
+    it('should log info level messages', () => {
+        const logger = Logger.withPrefix('test');
+        logger.info('test message');
+        expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('test message'));
+    });
+    it('should log success level messages', () => {
+        const logger = Logger.withPrefix('test');
+        logger.success('test message');
+        expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('test message'));
+    });
+    it('should log warn level messages', () => {
+        const logger = Logger.withPrefix('test');
+        logger.warn('test message');
+        expect(consoleErrorSpy).toHaveBeenCalledWith(expect.stringContaining('test message'));
+    });
+    it('should log error level messages', () => {
+        const logger = Logger.withPrefix('test');
+        logger.error('test message');
+        expect(consoleErrorSpy).toHaveBeenCalledWith(expect.stringContaining('test message'));
+    });
+    it('should not log debug level messages when debug is disabled (via method)', () => {
+        const logger = Logger.withPrefix('test');
+        logger.debug('test message');
+        expect(consoleLogSpy).not.toHaveBeenCalled();
+    });
+    it('should log debug level messages when debug is enabled (via method, no param)', () => {
+        Logger.setDebugEnabled();
+        const logger = Logger.withPrefix('test');
+        logger.debug('test message');
+        expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('test message'));
+        Logger.setDebugEnabled(false); // reset debug setting
+    });
+    it('should log debug level messages when debug is enabled (via method, with param)', () => {
+        Logger.setDebugEnabled(true);
+        const logger = Logger.withPrefix('test');
+        logger.debug('test message');
+        expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('test message'));
+        Logger.setDebugEnabled(false); // reset debug setting
+    });
+    it('should not include timestamps in log messages when timestamp is disabled (via method)', () => {
+        Logger.setTimestampEnabled(false);
+        const logger = Logger.withPrefix('test');
+        logger.info('test message');
+        expect(consoleLogSpy).not.toHaveBeenCalledWith(expect.stringMatching(/\[\d{1,2}\/\d{1,2}\/\d{4}, \d{1,2}:\d{2}:\d{2} (AM|PM)\].*/));
+    });
+    it('should include timestamps in log messages when timestamp is enabled (via method, no param)', () => {
+        Logger.setTimestampEnabled();
+        const logger = Logger.withPrefix('test');
+        logger.info('test message');
+        expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringMatching(/\[\d{1,2}\/\d{1,2}\/\d{4}, \d{1,2}:\d{2}:\d{2} (AM|PM)\].*/));
+        Logger.setTimestampEnabled(false); // reset timestamp setting
+    });
+    it('should include timestamps in log messages when timestamp is enabled (via method, with param)', () => {
+        Logger.setTimestampEnabled(true);
+        const logger = Logger.withPrefix('test');
+        logger.info('test message');
+        expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringMatching(/\[\d{1,2}\/\d{1,2}\/\d{4}, \d{1,2}:\d{2}:\d{2} (AM|PM)\].*/));
+        Logger.setTimestampEnabled(false); // reset timestamp setting
+    });
+    it('should set chalk level to 1 when forceColor is enabled (via method)', () => {
+        Logger.forceColor();
+        expect(chalk.level).toBe(1);
+    });
+    it('should return the same logger when called with the same prefix', () => {
+        const logger1 = Logger.withPrefix('test');
+        const logger2 = Logger.withPrefix('test');
+        expect(logger1).toBe(logger2);
+    });
+    it('should create different loggers for different prefixes', () => {
+        const logger1 = Logger.withPrefix('test1');
+        const logger2 = Logger.withPrefix('test2');
+        expect(logger1).not.toBe(logger2);
+        expect(logger1.prefix).toBe('test1');
+        expect(logger2.prefix).toBe('test2');
+    });
+});
+//# sourceMappingURL=logger.spec.js.map

package/dist/logger.spec.js.map

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

package/dist/matter/ChildBridgeMatterManager.d.ts

@@ -0,0 +1,96 @@
+/**
+ * Child Bridge Matter Manager
+ *
+ * Manages Matter server lifecycle and accessories for child bridges.
+ * This class extracts Matter-specific logic from childBridgeFork.ts to minimize changes to core files.
+ */
+import type { HomebridgeAPI } from '../api.js';
+import type { BridgeConfiguration, BridgeOptions } from '../bridgeService.js';
+import type { ChildBridgeExternalPortService } from '../externalPortService.js';
+import type { InternalMatterAccessory } from './types.js';
+import { PluginManager } from '../pluginManager.js';
+/**
+ * Matter status information for child bridge IPC communication
+ */
+export interface ChildBridgeMatterStatusInfo {
+    qrCode?: string;
+    manualPairingCode?: string;
+    serialNumber?: string;
+    commissioned: boolean;
+    deviceCount: number;
+}
+/**
+ * Manages Matter server and accessories for a child bridge
+ */
+export declare class ChildBridgeMatterManager {
+    private readonly bridgeConfig;
+    private readonly bridgeOptions;
+    private readonly api;
+    private readonly externalPortService;
+    private readonly pluginManager;
+    private matterServer?;
+    private readonly externalMatterServers;
+    private matterConfig?;
+    private matterSerialNumber?;
+    constructor(bridgeConfig: BridgeConfiguration, bridgeOptions: BridgeOptions, api: HomebridgeAPI, externalPortService: ChildBridgeExternalPortService, pluginManager: PluginManager);
+    /**
+     * Initialize Matter server for child bridge if enabled
+     * @param onCommissioningChanged - Callback when commissioning state changes
+     */
+    initialize(onCommissioningChanged: () => void): Promise<void>;
+    /**
+     * Start Matter server for child bridge
+     */
+    private startMatterServer;
+    /**
+     * Set up Matter API event listeners
+     */
+    private setupEventListeners;
+    /**
+     * Handle external Matter accessories - each gets its own dedicated Matter server
+     * This is required for devices like Robotic Vacuum Cleaners that Apple Home
+     * requires to be on their own bridge.
+     */
+    handlePublishExternalAccessories(accessories: InternalMatterAccessory[], registrationId: string): Promise<void>;
+    /**
+     * Handle registration of Matter platform accessories
+     */
+    handleRegisterPlatformAccessories(pluginIdentifier: string, platformName: string, accessories: InternalMatterAccessory[]): Promise<void>;
+    /**
+     * Handle updating Matter platform accessories in the cache
+     * Checks both external servers and child bridge server
+     */
+    handleUpdatePlatformAccessories(accessories: InternalMatterAccessory[]): Promise<void>;
+    /**
+     * Handle unregistration of Matter platform accessories
+     */
+    handleUnregisterPlatformAccessories(pluginIdentifier: string, platformName: string, accessories: InternalMatterAccessory[]): Promise<void>;
+    /**
+     * Handle unregistration of external Matter accessories
+     * Stops dedicated servers and cleans up storage
+     */
+    handleUnregisterExternalAccessories(accessories: InternalMatterAccessory[]): Promise<void>;
+    /**
+     * Handle Matter accessory state updates
+     * Checks both external servers and child bridge server
+     */
+    handleUpdateAccessoryState(uuid: string, cluster: string, attributes: Record<string, unknown>, partId?: string): Promise<void>;
+    /**
+     * Restore cached Matter accessories (matching HAP pattern)
+     */
+    restoreCachedAccessories(keepOrphaned: boolean): void;
+    /**
+     * Get Matter status information for IPC communication
+     * Returns undefined if Matter is not enabled for this child bridge
+     */
+    getMatterStatusInfo(): ChildBridgeMatterStatusInfo | undefined;
+    /**
+     * Check if Matter is enabled for this child bridge
+     */
+    isMatterEnabled(): boolean;
+    /**
+     * Teardown Matter servers
+     */
+    teardown(): Promise<void>;
+}
+//# sourceMappingURL=ChildBridgeMatterManager.d.ts.map

package/dist/matter/ChildBridgeMatterManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ChildBridgeMatterManager.d.ts","sourceRoot":"","sources":["../../src/matter/ChildBridgeMatterManager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC7E,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAA;AAC/E,OAAO,KAAK,EAAE,uBAAuB,EAAiC,MAAM,YAAY,CAAA;AAOxF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAQnD;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,YAAY,EAAE,OAAO,CAAA;IACrB,WAAW,EAAE,MAAM,CAAA;CACpB;AAED;;GAEG;AACH,qBAAa,wBAAwB;IAejC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAjBhC,OAAO,CAAC,YAAY,CAAC,CAAc;IAInC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAuC;IAG7E,OAAO,CAAC,YAAY,CAAC,CAAc;IAGnC,OAAO,CAAC,kBAAkB,CAAC,CAAQ;gBAGhB,YAAY,EAAE,mBAAmB,EACjC,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,aAAa,EAClB,mBAAmB,EAAE,8BAA8B,EACnD,aAAa,EAAE,aAAa;IAK/C;;;OAGG;IACG,UAAU,CAAC,sBAAsB,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BnE;;OAEG;YACW,iBAAiB;IAiD/B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAwC3B;;;;OAIG;IACG,gCAAgC,CAAC,WAAW,EAAE,uBAAuB,EAAE,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkDrH;;OAEG;IACG,iCAAiC,CAAC,gBAAgB,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ9I;;;OAGG;IACG,+BAA+B,CAAC,WAAW,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB5F;;OAEG;IACG,mCAAmC,CAAC,gBAAgB,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQhJ;;;OAGG;IACG,mCAAmC,CAAC,WAAW,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAyChG;;;OAGG;IACG,0BAA0B,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBpI;;OAEG;IACH,wBAAwB,CAAC,YAAY,EAAE,OAAO,GAAG,IAAI;IAmDrD;;;OAGG;IACH,mBAAmB,IAAI,2BAA2B,GAAG,SAAS;IAe9D;;OAEG;IACH,eAAe,IAAI,OAAO;IAI1B;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAsBhC"}

package/dist/matter/ChildBridgeMatterManager.js

@@ -0,0 +1,397 @@
+/**
+ * Child Bridge Matter Manager
+ *
+ * Manages Matter server lifecycle and accessories for child bridges.
+ * This class extracts Matter-specific logic from childBridgeFork.ts to minimize changes to core files.
+ */
+import { rmSync } from 'node:fs';
+import path from 'node:path';
+import { Logger } from '../logger.js';
+import { User } from '../user.js';
+import { generate } from '../util/mac.js';
+import { publishExternalMatterAccessory } from './ExternalMatterAccessoryPublisher.js';
+import { MatterServer } from './server.js';
+const log = Logger.internal;
+/**
+ * Manages Matter server and accessories for a child bridge
+ */
+export class ChildBridgeMatterManager {
+    bridgeConfig;
+    bridgeOptions;
+    api;
+    externalPortService;
+    pluginManager;
+    // Matter server instance for child bridge (if enabled)
+    matterServer;
+    // External Matter servers for accessories that need their own bridge
+    // Key is accessory UUID, value is MatterServer instance
+    externalMatterServers = new Map();
+    // Matter configuration from bridge config
+    matterConfig;
+    // Stored serial number for status updates
+    matterSerialNumber;
+    constructor(bridgeConfig, bridgeOptions, api, externalPortService, pluginManager) {
+        this.bridgeConfig = bridgeConfig;
+        this.bridgeOptions = bridgeOptions;
+        this.api = api;
+        this.externalPortService = externalPortService;
+        this.pluginManager = pluginManager;
+        this.matterConfig = bridgeConfig.matter;
+    }
+    /**
+     * Initialize Matter server for child bridge if enabled
+     * @param onCommissioningChanged - Callback when commissioning state changes
+     */
+    async initialize(onCommissioningChanged) {
+        // Check if Matter is configured
+        if (!this.matterConfig) {
+            return;
+        }
+        log.debug('Child bridge has Matter config (Combined HAP+Matter), starting Matter server');
+        // If Matter doesn't have a port configured, allocate one
+        if (!this.matterConfig.port) {
+            // Generate a unique username for Matter port allocation
+            const matterUsername = `${this.bridgeConfig.username}:MATTER`;
+            const matterPort = await this.externalPortService.requestPort(matterUsername);
+            if (!matterPort) {
+                throw new Error('Failed to allocate Matter port for child bridge. '
+                    + 'Please specify a port manually in the _bridge.matter configuration, or free up ports in the configured range.');
+            }
+            this.matterConfig.port = matterPort;
+            log.debug(`Allocated Matter port: ${this.matterConfig.port} (HAP port: ${this.bridgeConfig.port})`);
+        }
+        // Start Matter server
+        await this.startMatterServer(this.matterConfig, onCommissioningChanged);
+    }
+    /**
+     * Start Matter server for child bridge
+     */
+    async startMatterServer(matterConfig, onCommissioningChanged) {
+        log.info('Starting Matter server in child bridge process');
+        // Create Matter server with the provided configuration
+        const serialNumber = this.bridgeConfig.username.replace(/:/g, '');
+        // Normalize bind config to array format
+        const networkInterfaces = this.bridgeConfig.bind
+            ? Array.isArray(this.bridgeConfig.bind)
+                ? this.bridgeConfig.bind
+                : [this.bridgeConfig.bind]
+            : undefined;
+        this.matterServer = new MatterServer({
+            port: matterConfig.port || 5540,
+            uniqueId: serialNumber,
+            storagePath: User.matterPath(),
+            debugModeEnabled: this.bridgeOptions.debugModeEnabled,
+            manufacturer: this.bridgeConfig.manufacturer,
+            model: this.bridgeConfig.model,
+            firmwareRevision: this.bridgeConfig.firmwareRevision,
+            serialNumber,
+            networkInterfaces,
+        });
+        await this.matterServer.start();
+        // Inform the API that Matter is enabled
+        this.api._setMatterEnabled(true);
+        // Set the Matter server reference for API methods like getAccessoryState
+        this.api._setMatterServer(this.matterServer);
+        const commissioningInfo = this.matterServer.getCommissioningInfo();
+        log.info('Matter server started with commissioning info:', commissioningInfo);
+        // Store the serial number for status updates
+        this.matterSerialNumber = commissioningInfo.serialNumber;
+        // Listen for Matter commissioning events to update status
+        this.matterServer.on('commissioning-changed', (commissioned, fabricCount) => {
+            log.info(`Matter commissioning state changed: commissioned=${commissioned}, fabricCount=${fabricCount}`);
+            onCommissioningChanged();
+        });
+        // Set up event listeners for Matter API calls
+        this.setupEventListeners();
+    }
+    /**
+     * Set up Matter API event listeners
+     */
+    setupEventListeners() {
+        this.api.on("publishExternalMatterAccessories" /* InternalAPIEvent.PUBLISH_EXTERNAL_MATTER_ACCESSORIES */, (accessories, registrationId) => {
+            this.handlePublishExternalAccessories(accessories, registrationId).catch((error) => {
+                log.error('Failed to publish external Matter accessories:', error);
+                // Make sure to resolve the registration even on error
+                this.api._resolveExternalRegistration(registrationId);
+            });
+        });
+        this.api.on("registerMatterPlatformAccessories" /* InternalAPIEvent.REGISTER_MATTER_PLATFORM_ACCESSORIES */, (pluginIdentifier, platformName, accessories) => {
+            this.handleRegisterPlatformAccessories(pluginIdentifier, platformName, accessories).catch((error) => {
+                log.error(`Failed to register Matter accessories for ${pluginIdentifier}:`, error);
+            });
+        });
+        this.api.on("updateMatterPlatformAccessories" /* InternalAPIEvent.UPDATE_MATTER_PLATFORM_ACCESSORIES */, (accessories) => {
+            this.handleUpdatePlatformAccessories(accessories).catch((error) => {
+                log.error('Failed to update Matter platform accessories:', error);
+            });
+        });
+        this.api.on("unregisterMatterPlatformAccessories" /* InternalAPIEvent.UNREGISTER_MATTER_PLATFORM_ACCESSORIES */, (pluginIdentifier, platformName, accessories) => {
+            this.handleUnregisterPlatformAccessories(pluginIdentifier, platformName, accessories).catch((error) => {
+                log.error(`Failed to unregister Matter accessories for ${pluginIdentifier}:`, error);
+            });
+        });
+        this.api.on("unregisterExternalMatterAccessories" /* InternalAPIEvent.UNREGISTER_EXTERNAL_MATTER_ACCESSORIES */, (accessories) => {
+            this.handleUnregisterExternalAccessories(accessories).catch((error) => {
+                log.error('Failed to unregister external Matter accessories:', error);
+            });
+        });
+        this.api.on("updateMatterAccessoryState" /* InternalAPIEvent.UPDATE_MATTER_ACCESSORY_STATE */, (uuid, cluster, attributes, partId) => {
+            this.handleUpdateAccessoryState(uuid, cluster, attributes, partId).catch((error) => {
+                log.error(`Failed to update Matter accessory state for ${uuid}:`, error);
+            });
+        });
+    }
+    /**
+     * Handle external Matter accessories - each gets its own dedicated Matter server
+     * This is required for devices like Robotic Vacuum Cleaners that Apple Home
+     * requires to be on their own bridge.
+     */
+    async handlePublishExternalAccessories(accessories, registrationId) {
+        log.info(`Publishing ${accessories.length} external Matter accessor${accessories.length === 1 ? 'y' : 'ies'} from child bridge`);
+        try {
+            // Normalize bind config to array format (inherit from bridge)
+            const networkInterfaces = this.bridgeConfig.bind
+                ? Array.isArray(this.bridgeConfig.bind)
+                    ? this.bridgeConfig.bind
+                    : [this.bridgeConfig.bind]
+                : undefined;
+            for (const accessory of accessories) {
+                try {
+                    // Check if already published
+                    if (this.externalMatterServers.has(accessory.uuid)) {
+                        log.warn(`External Matter accessory ${accessory.displayName} (${accessory.uuid}) is already published`);
+                        continue;
+                    }
+                    // Publish the accessory using shared helper
+                    const result = await publishExternalMatterAccessory(accessory, {
+                        portService: this.externalPortService,
+                        networkInterfaces,
+                        debugModeEnabled: this.bridgeOptions.debugModeEnabled,
+                    });
+                    if (!result) {
+                        // Validation or publishing failed (errors already logged by helper)
+                        continue;
+                    }
+                    // Store the server instance
+                    this.externalMatterServers.set(accessory.uuid, result.server);
+                    // Log commissioning info
+                    if (result.commissioningInfo.qrCode && result.commissioningInfo.manualPairingCode) {
+                        log.info(`📱 Commissioning codes for ${accessory.displayName}:`);
+                        log.info(`   QR Code: ${result.commissioningInfo.qrCode}`);
+                        log.info(`   Manual Code: ${result.commissioningInfo.manualPairingCode}`);
+                    }
+                }
+                catch (error) {
+                    log.error(`Failed to publish external Matter accessory ${accessory.displayName}:`, error);
+                }
+            }
+        }
+        finally {
+            // Notify that registration is complete (whether successful or not)
+            this.api._resolveExternalRegistration(registrationId);
+        }
+    }
+    /**
+     * Handle registration of Matter platform accessories
+     */
+    async handleRegisterPlatformAccessories(pluginIdentifier, platformName, accessories) {
+        if (!this.matterServer) {
+            log.warn('Cannot register Matter accessories - Matter server is not running');
+            return;
+        }
+        await this.matterServer.registerPlatformAccessories(pluginIdentifier, platformName, accessories);
+    }
+    /**
+     * Handle updating Matter platform accessories in the cache
+     * Checks both external servers and child bridge server
+     */
+    async handleUpdatePlatformAccessories(accessories) {
+        const bridgeAccessories = [];
+        // Route each accessory to the appropriate server
+        for (const accessory of accessories) {
+            const externalServer = this.externalMatterServers.get(accessory.uuid);
+            if (externalServer) {
+                // Update external accessory
+                await externalServer.updatePlatformAccessories([accessory]);
+            }
+            else {
+                // Collect accessories for child bridge
+                bridgeAccessories.push(accessory);
+            }
+        }
+        // Update accessories on child bridge server if any
+        if (bridgeAccessories.length > 0) {
+            if (!this.matterServer) {
+                log.warn('Cannot update Matter platform accessories - Matter server is not running');
+                return;
+            }
+            await this.matterServer.updatePlatformAccessories(bridgeAccessories);
+        }
+    }
+    /**
+     * Handle unregistration of Matter platform accessories
+     */
+    async handleUnregisterPlatformAccessories(pluginIdentifier, platformName, accessories) {
+        if (!this.matterServer) {
+            log.warn('Cannot unregister Matter accessories - Matter server is not running');
+            return;
+        }
+        await this.matterServer.unregisterPlatformAccessories(pluginIdentifier, platformName, accessories);
+    }
+    /**
+     * Handle unregistration of external Matter accessories
+     * Stops dedicated servers and cleans up storage
+     */
+    async handleUnregisterExternalAccessories(accessories) {
+        log.info(`Unregistering ${accessories.length} external Matter accessor${accessories.length === 1 ? 'y' : 'ies'} from child bridge`);
+        for (const accessory of accessories) {
+            try {
+                // Check if this external server exists
+                const matterServer = this.externalMatterServers.get(accessory.uuid);
+                if (!matterServer) {
+                    log.warn(`External Matter accessory ${accessory.displayName} (${accessory.uuid}) is not registered`);
+                    continue;
+                }
+                log.info(`Stopping external Matter server for ${accessory.displayName}`);
+                // Stop the Matter server
+                await matterServer.stop();
+                // Remove from the map
+                this.externalMatterServers.delete(accessory.uuid);
+                // Clean up storage folder
+                // Generate the same uniqueId that was used when creating the server
+                const advertiseAddress = generate(accessory.uuid);
+                const uniqueId = advertiseAddress.replace(/:/g, '');
+                const storagePath = path.join(User.matterPath(), uniqueId);
+                try {
+                    log.debug(`Removing Matter storage for external accessory at: ${storagePath}`);
+                    rmSync(storagePath, { recursive: true, force: true });
+                    log.info(`✓ Cleaned up storage for external Matter accessory: ${accessory.displayName}`);
+                }
+                catch (error) {
+                    log.error(`Failed to clean up storage for external Matter accessory ${accessory.displayName}:`, error);
+                }
+                log.info(`✓ External Matter accessory unregistered: ${accessory.displayName}`);
+            }
+            catch (error) {
+                log.error(`Failed to unregister external Matter accessory ${accessory.displayName}:`, error);
+            }
+        }
+    }
+    /**
+     * Handle Matter accessory state updates
+     * Checks both external servers and child bridge server
+     */
+    async handleUpdateAccessoryState(uuid, cluster, attributes, partId) {
+        // Check if this is an external accessory first (each has its own MatterServer)
+        const externalServer = this.externalMatterServers.get(uuid);
+        if (externalServer) {
+            await externalServer.updateAccessoryState(uuid, cluster, attributes, partId);
+            return;
+        }
+        // Otherwise, try the main child bridge Matter server
+        if (!this.matterServer) {
+            log.warn(`Cannot update Matter accessory state for ${uuid} - accessory not found in external servers and child bridge Matter server is not running`);
+            return;
+        }
+        await this.matterServer.updateAccessoryState(uuid, cluster, attributes, partId);
+    }
+    /**
+     * Restore cached Matter accessories (matching HAP pattern)
+     */
+    restoreCachedAccessories(keepOrphaned) {
+        if (!this.matterServer) {
+            log.debug('Matter server not available for restoring cached accessories');
+            return;
+        }
+        const cachedAccessories = this.matterServer.getAllCachedAccessories();
+        log.debug(`Restoring ${cachedAccessories.length} cached Matter accessories`);
+        for (const cachedAccessory of cachedAccessories) {
+            let plugin = this.pluginManager.getPlugin(cachedAccessory.plugin);
+            if (!plugin) {
+                try {
+                    // Try to find plugin by platform name (handles plugin renames)
+                    plugin = this.pluginManager.getPluginByActiveDynamicPlatform(cachedAccessory.platform);
+                    if (plugin) {
+                        log.info(`When searching for the associated plugin of the Matter accessory '${cachedAccessory.displayName}' `
+                            + `it seems like the plugin name changed from '${cachedAccessory.plugin}' to '${plugin.getPluginIdentifier()}'. Plugin association is now being transformed!`);
+                    }
+                }
+                catch (error) {
+                    const errorMessage = error instanceof Error ? error.message : String(error);
+                    log.warn(`Could not find the associated plugin for the Matter accessory '${cachedAccessory.displayName}'. `
+                        + `Tried to find the plugin by the platform name but ${errorMessage}`);
+                }
+            }
+            const platformPlugin = plugin && plugin.getActiveDynamicPlatform(cachedAccessory.platform);
+            if (!platformPlugin) {
+                log.warn(`Failed to find plugin to handle Matter accessory ${cachedAccessory.displayName} (plugin: ${cachedAccessory.plugin}, platform: ${cachedAccessory.platform})`);
+                if (!keepOrphaned) {
+                    log.info(`Removing orphaned Matter accessory ${cachedAccessory.displayName}`);
+                    this.matterServer.unregisterAccessory(cachedAccessory.uuid).catch((error) => {
+                        log.warn(`Failed to unregister orphaned Matter accessory ${cachedAccessory.displayName}:`, error);
+                    });
+                }
+            }
+            else {
+                // Call configureMatterAccessory if the plugin implements it
+                if (platformPlugin.configureMatterAccessory) {
+                    log.debug(`Calling configureMatterAccessory for ${cachedAccessory.displayName}`);
+                    platformPlugin.configureMatterAccessory(cachedAccessory);
+                }
+                else {
+                    log.debug(`Platform ${cachedAccessory.platform} does not implement configureMatterAccessory`);
+                }
+            }
+        }
+    }
+    /**
+     * Get Matter status information for IPC communication
+     * Returns undefined if Matter is not enabled for this child bridge
+     */
+    getMatterStatusInfo() {
+        if (!this.matterConfig || !this.matterServer) {
+            return undefined;
+        }
+        const commissioningInfo = this.matterServer.getCommissioningInfo();
+        return {
+            qrCode: commissioningInfo.qrCode,
+            manualPairingCode: commissioningInfo.manualPairingCode,
+            serialNumber: this.matterSerialNumber || commissioningInfo.serialNumber,
+            commissioned: commissioningInfo.commissioned || false,
+            deviceCount: this.matterServer.getAccessories().length,
+        };
+    }
+    /**
+     * Check if Matter is enabled for this child bridge
+     */
+    isMatterEnabled() {
+        return this.matterServer !== undefined;
+    }
+    /**
+     * Teardown Matter servers
+     */
+    async teardown() {
+        // Stop main Matter server if it was initialized
+        if (this.matterServer) {
+            log.debug('Stopping Matter server');
+            try {
+                await this.matterServer.stop();
+            }
+            catch (error) {
+                log.error('Error stopping Matter server:', error);
+            }
+        }
+        // Stop all external Matter servers
+        for (const [uuid, matterServer] of this.externalMatterServers) {
+            log.debug(`Stopping external Matter server for ${uuid}`);
+            try {
+                await matterServer.stop();
+            }
+            catch (error) {
+                log.error(`Error stopping external Matter server for ${uuid}:`, error);
+            }
+        }
+        this.externalMatterServers.clear();
+    }
+}
+//# sourceMappingURL=ChildBridgeMatterManager.js.map