homebridge 2.0.0-beta.35 → 2.0.0-beta.36

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

package/dist/matter/ChildBridgeMatterManager.js.map

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

package/dist/matter/ExternalMatterAccessoryPublisher.d.ts

@@ -0,0 +1,48 @@
+/**
+ * External Matter Accessory Publisher
+ *
+ * Shared logic for publishing external Matter accessories on dedicated bridges.
+ * Used by both MatterBridgeManager and ChildBridgeMatterManager to avoid code duplication.
+ */
+import type { InternalMatterAccessory } from './types.js';
+import { MatterServer } from './server.js';
+/**
+ * Configuration context for publishing external Matter accessories
+ */
+export interface ExternalAccessoryPublishContext {
+    /** Port service for allocating Matter ports */
+    portService: {
+        requestMatterPort: (uniqueId: string) => Promise<number | null | undefined>;
+    };
+    /** Network interfaces to bind to (from bridge config) */
+    networkInterfaces?: string[];
+    /** Whether debug mode is enabled */
+    debugModeEnabled?: boolean;
+}
+/**
+ * Result of publishing an external Matter accessory
+ */
+export interface PublishedExternalAccessory {
+    /** The MatterServer instance for this accessory */
+    server: MatterServer;
+    /** Port the server is running on */
+    port: number;
+    /** Commissioning information */
+    commissioningInfo: {
+        qrCode?: string;
+        manualPairingCode?: string;
+        serialNumber?: string;
+        commissioned: boolean;
+    };
+}
+/**
+ * Publish an external Matter accessory on its own dedicated Matter server.
+ * This is required for devices like Robotic Vacuum Cleaners that Apple Home
+ * requires to be on their own bridge.
+ *
+ * @param accessory - The Matter accessory to publish
+ * @param context - Configuration context for publishing
+ * @returns Published accessory info, or null if publishing failed
+ */
+export declare function publishExternalMatterAccessory(accessory: InternalMatterAccessory, context: ExternalAccessoryPublishContext): Promise<PublishedExternalAccessory | null>;
+//# sourceMappingURL=ExternalMatterAccessoryPublisher.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ExternalMatterAccessoryPublisher.d.ts","sourceRoot":"","sources":["../../src/matter/ExternalMatterAccessoryPublisher.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAA;AAKzD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAI1C;;GAEG;AACH,MAAM,WAAW,+BAA+B;IAC9C,+CAA+C;IAC/C,WAAW,EAAE;QACX,iBAAiB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,CAAA;KAC5E,CAAA;IACD,yDAAyD;IACzD,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC5B,oCAAoC;IACpC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC,mDAAmD;IACnD,MAAM,EAAE,YAAY,CAAA;IACpB,oCAAoC;IACpC,IAAI,EAAE,MAAM,CAAA;IACZ,gCAAgC;IAChC,iBAAiB,EAAE;QACjB,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,iBAAiB,CAAC,EAAE,MAAM,CAAA;QAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,YAAY,EAAE,OAAO,CAAA;KACtB,CAAA;CACF;AAED;;;;;;;;GAQG;AACH,wBAAsB,8BAA8B,CAClD,SAAS,EAAE,uBAAuB,EAClC,OAAO,EAAE,+BAA+B,GACvC,OAAO,CAAC,0BAA0B,GAAG,IAAI,CAAC,CAgE5C"}

package/dist/matter/ExternalMatterAccessoryPublisher.js

@@ -0,0 +1,73 @@
+/**
+ * External Matter Accessory Publisher
+ *
+ * Shared logic for publishing external Matter accessories on dedicated bridges.
+ * Used by both MatterBridgeManager and ChildBridgeMatterManager to avoid code duplication.
+ */
+import { Logger } from '../logger.js';
+import { User } from '../user.js';
+import { generate } from '../util/mac.js';
+import { MatterServer } from './server.js';
+const log = Logger.internal;
+/**
+ * Publish an external Matter accessory on its own dedicated Matter server.
+ * This is required for devices like Robotic Vacuum Cleaners that Apple Home
+ * requires to be on their own bridge.
+ *
+ * @param accessory - The Matter accessory to publish
+ * @param context - Configuration context for publishing
+ * @returns Published accessory info, or null if publishing failed
+ */
+export async function publishExternalMatterAccessory(accessory, context) {
+    // Validate accessory has required fields
+    if (!accessory.uuid) {
+        log.error('External Matter accessory missing UUID - skipping');
+        return null;
+    }
+    if (!accessory.displayName) {
+        log.error(`External Matter accessory ${accessory.uuid} missing displayName - skipping`);
+        return null;
+    }
+    // Generate deterministic MAC address from UUID (same pattern as HAP external accessories)
+    const advertiseAddress = generate(accessory.uuid);
+    // For Matter, use the MAC without colons as uniqueId
+    const uniqueId = advertiseAddress.replace(/:/g, '');
+    // Allocate Matter port for the external Matter server
+    const port = await context.portService.requestMatterPort(uniqueId);
+    if (!port) {
+        log.error(`Failed to allocate Matter port for external Matter accessory ${accessory.displayName}`);
+        log.error('Please configure matterPorts in config.json or free up ports in the default range (5530-5541)');
+        return null;
+    }
+    log.info(`Allocated port ${port} for external Matter accessory: ${accessory.displayName}`);
+    // Create dedicated Matter server for this accessory
+    const matterServer = new MatterServer({
+        port,
+        uniqueId,
+        storagePath: User.matterPath(),
+        manufacturer: accessory.manufacturer,
+        model: accessory.model,
+        firmwareRevision: accessory.firmwareRevision,
+        serialNumber: accessory.serialNumber || uniqueId, // use uniqueId as fallback serial number
+        debugModeEnabled: context.debugModeEnabled,
+        externalAccessory: true, // external accessory, added before server runs
+        networkInterfaces: context.networkInterfaces,
+    });
+    // Start the Matter server (but don't run it yet due to externalAccessory mode)
+    await matterServer.start();
+    // Get plugin identifier from accessory
+    const pluginIdentifier = accessory._associatedPlugin || 'unknown';
+    // Register the accessory to this dedicated server
+    await matterServer.registerPlatformAccessories(pluginIdentifier, 'ExternalMatter', [accessory]);
+    // Now run the server with the device already attached (required for external accessories)
+    await matterServer.runServer();
+    log.info(`✓ External Matter accessory published: ${accessory.displayName} on port ${port}`);
+    // Get commissioning info
+    const commissioningInfo = matterServer.getCommissioningInfo();
+    return {
+        server: matterServer,
+        port,
+        commissioningInfo,
+    };
+}
+//# sourceMappingURL=ExternalMatterAccessoryPublisher.js.map

package/dist/matter/ExternalMatterAccessoryPublisher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExternalMatterAccessoryPublisher.js","sourceRoot":"","sources":["../../src/matter/ExternalMatterAccessoryPublisher.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAA;AAiC3B;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,SAAkC,EAClC,OAAwC;IAExC,yCAAyC;IACzC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACpB,GAAG,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAA;QAC9D,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QAC3B,GAAG,CAAC,KAAK,CAAC,6BAA6B,SAAS,CAAC,IAAI,iCAAiC,CAAC,CAAA;QACvF,OAAO,IAAI,CAAA;IACb,CAAC;IAED,0FAA0F;IAC1F,MAAM,gBAAgB,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAEjD,qDAAqD;IACrD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IAEnD,sDAAsD;IACtD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAA;IAClE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,GAAG,CAAC,KAAK,CAAC,gEAAgE,SAAS,CAAC,WAAW,EAAE,CAAC,CAAA;QAClG,GAAG,CAAC,KAAK,CAAC,+FAA+F,CAAC,CAAA;QAC1G,OAAO,IAAI,CAAA;IACb,CAAC;IAED,GAAG,CAAC,IAAI,CAAC,kBAAkB,IAAI,mCAAmC,SAAS,CAAC,WAAW,EAAE,CAAC,CAAA;IAE1F,oDAAoD;IACpD,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC;QACpC,IAAI;QACJ,QAAQ;QACR,WAAW,EAAE,IAAI,CAAC,UAAU,EAAE;QAC9B,YAAY,EAAE,SAAS,CAAC,YAAY;QACpC,KAAK,EAAE,SAAS,CAAC,KAAK;QACtB,gBAAgB,EAAE,SAAS,CAAC,gBAAgB;QAC5C,YAAY,EAAE,SAAS,CAAC,YAAY,IAAI,QAAQ,EAAE,yCAAyC;QAC3F,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;QAC1C,iBAAiB,EAAE,IAAI,EAAE,+CAA+C;QACxE,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;KAC7C,CAAC,CAAA;IAEF,+EAA+E;IAC/E,MAAM,YAAY,CAAC,KAAK,EAAE,CAAA;IAE1B,uCAAuC;IACvC,MAAM,gBAAgB,GAAG,SAAS,CAAC,iBAAiB,IAAI,SAAS,CAAA;IAEjE,kDAAkD;IAClD,MAAM,YAAY,CAAC,2BAA2B,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;IAE/F,0FAA0F;IAC1F,MAAM,YAAY,CAAC,SAAS,EAAE,CAAA;IAE9B,GAAG,CAAC,IAAI,CAAC,0CAA0C,SAAS,CAAC,WAAW,YAAY,IAAI,EAAE,CAAC,CAAA;IAE3F,yBAAyB;IACzB,MAAM,iBAAiB,GAAG,YAAY,CAAC,oBAAoB,EAAE,CAAA;IAE7D,OAAO;QACL,MAAM,EAAE,YAAY;QACpB,IAAI;QACJ,iBAAiB;KAClB,CAAA;AACH,CAAC"}

package/dist/matter/ExternalMatterAccessoryPublisher.spec.d.ts

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