homebridge 2.0.0-alpha.43 → 2.0.0-alpha.45

package/dist/server.js

@@ -38,14 +38,10 @@ export class Server {
     externalPortService;
     config;
     // used to keep track of child bridges
-    // Key is either HAP username (MAC address) or Matter-only identifier (e.g., "matter-plugin-platform")
+    // Key is HAP username (MAC address)
     childBridges = new Map();
     // Matter server instance for main bridge (if enabled)
     matterServer;
-    // Cache for Matter bridge identifier -> ChildBridgeService lookups
-    matterBridgeCache = new Map();
-    // Track platform configurations for routing accessories
-    platformConfigs = new Map();
     // current server status
     serverStatus = "pending" /* ServerStatus.PENDING */;
     constructor(options = {}) {
@@ -72,7 +68,7 @@ export class Server {
         };
         // shallow copy the homebridge options to the bridge options object
         Object.assign(bridgeConfig, this.options);
-        this.bridgeService = new BridgeService(this.api, this.pluginManager, this.externalPortService, bridgeConfig, this.config.bridge, this.config);
+        this.bridgeService = new BridgeService(this.api, this.pluginManager, this.externalPortService, bridgeConfig, this.config.bridge);
         // Handle platform accessory registration
         this.api.on("registerPlatformAccessories" /* InternalAPIEvent.REGISTER_PLATFORM_ACCESSORIES */, this.handleRegisterPlatformAccessories.bind(this));
         this.api.on("unregisterPlatformAccessories" /* InternalAPIEvent.UNREGISTER_PLATFORM_ACCESSORIES */, this.handleUnregisterPlatformAccessories.bind(this));
@@ -101,15 +97,38 @@ export class Server {
      */
     setServerStatus(status) {
         this.serverStatus = status;
-        this.ipcService.sendMessage("serverStatusUpdate" /* IpcOutgoingEvent.SERVER_STATUS_UPDATE */, {
-            type: 'hap', // Main bridge is HAP
+        const statusUpdate = {
             status: this.serverStatus,
             paired: this.bridgeService?.bridge?._accessoryInfo?.paired() ?? null,
             setupUri: this.bridgeService?.bridge?.setupURI() ?? null,
-            name: this.bridgeService?.bridge?.displayName || this.config.bridge.name,
+            name: this.config.bridge.name,
             username: this.config.bridge.username,
             pin: this.config.bridge.pin,
-        });
+            matter: {
+                enabled: false,
+            },
+        };
+        // Include Matter commissioning info if Matter is enabled
+        if (this.matterServer) {
+            const commissioningInfo = this.matterServer.getCommissioningInfo();
+            statusUpdate.matter = {
+                enabled: true,
+                port: this.config.bridge.matter?.port,
+                setupUri: commissioningInfo.qrCode,
+                pin: commissioningInfo.manualPairingCode,
+                serialNumber: commissioningInfo.serialNumber,
+                commissioned: commissioningInfo.commissioned || false,
+                deviceCount: this.matterServer.getAccessories().length,
+            };
+        }
+        else if (this.config.bridge.matter) {
+            // Matter is configured but not yet started (or failed to start)
+            statusUpdate.matter = {
+                enabled: false,
+                port: this.config.bridge.matter?.port,
+            };
+        }
+        this.ipcService.sendMessage("serverStatusUpdate" /* IpcOutgoingEvent.SERVER_STATUS_UPDATE */, statusUpdate);
     }
     async start() {
         if (this.config.bridge.disableIpc !== true) {
@@ -128,7 +147,7 @@ export class Server {
         if (this.config.accessories.length > 0) {
             this.loadAccessories();
         }
-        // start child HAP bridges
+        // start child bridges
         for (const childBridge of this.childBridges.values()) {
             childBridge.start();
         }
@@ -147,10 +166,12 @@ export class Server {
         if (!this.config.bridge.matter) {
             return;
         }
+        // Declare matterPort outside try block so it's accessible in catch
+        let matterPort;
         try {
             log.info('Initializing Matter server for main bridge...');
             // Allocate port from pool if not explicitly configured
-            let matterPort = this.config.bridge.matter.port;
+            matterPort = this.config.bridge.matter.port;
             if (!matterPort) {
                 matterPort = await this.externalPortService.requestPort(`${this.config.bridge.username}:MATTER`);
                 if (!matterPort) {
@@ -161,22 +182,25 @@ export class Server {
                     log.info(`Allocated port ${matterPort} from pool for main Matter bridge`);
                 }
             }
-            // Create Matter server instance
+            // Create Matter server instance with config inheritance from main bridge
             this.matterServer = new MatterServer({
                 storagePath: User.matterPath(),
                 port: matterPort,
-                uniqueId: 'main-bridge',
-                name: this.config.bridge.matter.name || (this.config.bridge.name ? `${this.config.bridge.name} (Matter)` : 'Homebridge Matter Bridge'),
+                uniqueId: this.config.bridge.username,
+                manufacturer: this.config.bridge.manufacturer,
+                model: this.config.bridge.model,
+                firmwareRevision: this.config.bridge.firmwareRevision,
+                serialNumber: this.config.bridge.serialNumber,
+                debugModeEnabled: this.options.debugModeEnabled,
             });
             // Start the Matter server
             await this.matterServer.start();
             log.info('Matter server initialized for main bridge');
             // Inform the API that Matter is enabled
             this.api._setMatterEnabled(true);
-            // Send Matter status update to notify UI that Matter server is ready
-            if (this.config.bridge.disableIpc !== true) {
-                this.sendMainBridgeMatterStatusUpdate();
-            }
+            // Set the Matter server reference for API methods like getAccessoryState
+            this.api._setMatterServer(this.matterServer);
+            // Matter server is running - status updates will be handled through unified child bridge events
         }
         catch (error) {
             log.error('Failed to initialize Matter server for main bridge:', error);
@@ -192,40 +216,32 @@ export class Server {
                 log.error('║  • Incomplete writes during shutdown                                       ║');
                 log.error('║                                                                            ║');
                 log.error('║  To fix this, delete the corrupted storage directory:                     ║');
-                log.error('║  rm -rf ~/.homebridge/matter/main-bridge                                   ║');
+                log.error(`║  rm -rf ~/.homebridge/matter/${this.config.bridge.username}                                   ║`);
                 log.error('║                                                                            ║');
                 log.error('║  Note: You will need to re-pair your Matter devices after deletion.       ║');
                 log.error('╚════════════════════════════════════════════════════════════════════════════╝');
                 log.error('');
             }
+            else if (error.code === 'EADDRINUSE' || (error.message && error.message.includes('address already in use'))) {
+                log.error('');
+                log.error('╔════════════════════════════════════════════════════════════════════════════╗');
+                log.error('║  MATTER PORT ALREADY IN USE                                                ║');
+                log.error('╠════════════════════════════════════════════════════════════════════════════╣');
+                log.error(`║  Port ${matterPort} is already in use by another application.                    ║`);
+                log.error('║                                                                            ║');
+                log.error('║  To fix this:                                                              ║');
+                log.error('║  1. Stop the application using this port, or                              ║');
+                log.error('║  2. Configure a different port in your config.json:                       ║');
+                log.error('║     "bridge": {                                                            ║');
+                log.error('║       "matter": {                                                          ║');
+                log.error('║         "port": <different-port>                                           ║');
+                log.error('║       }                                                                    ║');
+                log.error('║     }                                                                      ║');
+                log.error('╚════════════════════════════════════════════════════════════════════════════╝');
+                log.error('');
+            }
         }
     }
-    /**
-     * Send Matter status update for main bridge
-     */
-    sendMainBridgeMatterStatusUpdate() {
-        if (!this.matterServer || !this.matterServer.isServerRunning()) {
-            return;
-        }
-        const commissioningInfo = this.matterServer.getCommissioningInfo();
-        // Transform property names to match UI expectations
-        const statusUpdate = {
-            type: 'matter',
-            status: 'ok',
-            port: this.config.bridge.matter?.port || 5540,
-            setupUri: commissioningInfo.qrCode, // Map qrCode -> setupUri for UI
-            pin: commissioningInfo.manualPairingCode, // Map manualPairingCode -> pin for UI
-            serialNumber: commissioningInfo.serialNumber,
-            passcode: commissioningInfo.passcode,
-            discriminator: commissioningInfo.discriminator,
-            name: this.config.bridge.matter?.name || (this.config.bridge.name ? `${this.config.bridge.name} (Matter)` : 'Homebridge Matter Bridge'),
-            plugin: 'main-bridge',
-            identifier: 'main-bridge',
-            deviceCount: this.matterServer.getAccessories().length,
-            commissioned: commissioningInfo.commissioned,
-        };
-        this.ipcService.sendMessage("matterBridgeStatusUpdate" /* IpcOutgoingEvent.MATTER_BRIDGE_STATUS_UPDATE */, statusUpdate);
-    }
     async teardown() {
         this.bridgeService.teardown();
         // Stop main Matter server if running
@@ -242,7 +258,6 @@ export class Server {
     }
     publishBridge() {
         this.bridgeService.publishBridge();
-        // Main bridge always has a pin (validated in loadConfig)
         this.printSetupInfo(this.config.bridge.pin);
     }
     handlePublishExternalAccessories(accessories) {
@@ -322,7 +337,6 @@ export class Server {
         bridge.username = bridge.username || defaultBridge.username;
         bridge.pin = bridge.pin || defaultBridge.pin;
         config.bridge = bridge;
-        // Main bridge username is always required and must be valid
         const username = config.bridge.username;
         if (!validMacAddress(username)) {
             throw new Error(`Not a valid username: ${username}. Must be 6 pairs of colon-separated hexadecimal chars (A-F 0-9), like a MAC address.`);
@@ -342,10 +356,6 @@ export class Server {
         if (config.bridge.matter || config.platforms.some((p) => p._bridge?.matter) || config.accessories.some((a) => a._bridge?.matter)) {
             // Validate main bridge Matter config
             if (config.bridge.matter) {
-                // Apply default name before validation if not set
-                if (!config.bridge.matter.name) {
-                    config.bridge.matter.name = config.bridge.name ? `${config.bridge.name} (Matter)` : 'Homebridge Matter Bridge';
-                }
                 const validation = MatterConfigValidator.validate(config.bridge.matter);
                 if (!validation.isValid) {
                     log.error('Main bridge Matter configuration is invalid. Matter will not be enabled for the main bridge.');
@@ -434,37 +444,29 @@ export class Server {
             }
             const logger = Logger.withPrefix(displayName);
             logger('Initializing %s accessory...', accessoryIdentifier);
-            // Handle child bridge (HAP, Matter-only, or HAP+Matter)
             if (accessoryConfig._bridge) {
-                // Ensure the username is always uppercase if it exists (HAP bridges only)
-                if (accessoryConfig._bridge.username) {
-                    accessoryConfig._bridge.username = accessoryConfig._bridge.username.toUpperCase();
-                }
-                // Generate unique key for this child bridge
-                const bridgeKey = this.getChildBridgeKey("accessory" /* PluginType.ACCESSORY */, accessoryIdentifier, plugin.getPluginIdentifier(), accessoryConfig._bridge);
+                // ensure the username is always uppercase
+                accessoryConfig._bridge.username = accessoryConfig._bridge.username.toUpperCase();
                 try {
-                    this.validateChildBridgeConfig("accessory" /* PluginType.ACCESSORY */, accessoryIdentifier, plugin.getPluginIdentifier(), accessoryConfig._bridge, bridgeKey);
+                    this.validateChildBridgeConfig("accessory" /* PluginType.ACCESSORY */, accessoryIdentifier, accessoryConfig._bridge);
                 }
                 catch (error) {
                     log.error(error.message);
                     return;
                 }
                 let childBridge;
-                if (this.childBridges.has(bridgeKey)) {
-                    childBridge = this.childBridges.get(bridgeKey);
-                    logger(`Adding to existing child bridge ${bridgeKey}`);
+                if (this.childBridges.has(accessoryConfig._bridge.username)) {
+                    childBridge = this.childBridges.get(accessoryConfig._bridge.username);
+                    logger(`Adding to existing child bridge ${accessoryConfig._bridge.username}`);
                 }
                 else {
-                    const bridgeType = accessoryConfig._bridge.matterOnly ? 'Matter-only' : 'HAP';
-                    logger(`Initializing ${bridgeType} child bridge ${bridgeKey}`);
+                    logger(`Initializing child bridge ${accessoryConfig._bridge.username}`);
                     childBridge = new ChildBridgeService("accessory" /* PluginType.ACCESSORY */, accessoryIdentifier, plugin, accessoryConfig._bridge, this.config, this.options, this.api, this.ipcService, this.externalPortService);
-                    this.childBridges.set(bridgeKey, childBridge);
+                    this.childBridges.set(accessoryConfig._bridge.username, childBridge);
                 }
                 // add config to child bridge service
                 childBridge.addConfig(accessoryConfig);
-                // Matter for child bridges is handled inside the forked child process (childBridgeFork.ts)
-                // to maintain isolation - each child process manages its own Matter server
-                return; // Done - child bridge
+                return;
             }
             const accessoryInstance = new constructor(logger, accessoryConfig, this.api);
             // pass accessoryIdentifier for UUID generation, and optional parameter uuid_base which can be used instead of displayName for UUID generation
@@ -521,29 +523,21 @@ export class Server {
             }
             const logger = Logger.withPrefix(displayName);
             logger('Initializing %s platform...', platformIdentifier);
-            // Handle child bridge (HAP, Matter-only, or HAP+Matter)
             if (platformConfig._bridge) {
-                // Ensure the username is always uppercase if it exists (HAP bridges only)
-                if (platformConfig._bridge.username) {
-                    platformConfig._bridge.username = platformConfig._bridge.username.toUpperCase();
-                }
-                // Generate unique key for this child bridge
-                const bridgeKey = this.getChildBridgeKey("platform" /* PluginType.PLATFORM */, platformIdentifier, plugin.getPluginIdentifier(), platformConfig._bridge);
+                // ensure the username is always uppercase
+                platformConfig._bridge.username = platformConfig._bridge.username.toUpperCase();
                 try {
-                    this.validateChildBridgeConfig("platform" /* PluginType.PLATFORM */, platformIdentifier, plugin.getPluginIdentifier(), platformConfig._bridge, bridgeKey);
+                    this.validateChildBridgeConfig("platform" /* PluginType.PLATFORM */, platformIdentifier, platformConfig._bridge);
                 }
                 catch (error) {
                     log.error(error.message);
                     return;
                 }
-                const bridgeType = platformConfig._bridge.matterOnly ? 'Matter-only' : 'HAP';
-                logger(`Initializing ${bridgeType} child bridge ${bridgeKey}`);
+                logger(`Initializing child bridge ${platformConfig._bridge.username}`);
                 const childBridge = new ChildBridgeService("platform" /* PluginType.PLATFORM */, platformIdentifier, plugin, platformConfig._bridge, this.config, this.options, this.api, this.ipcService, this.externalPortService);
-                this.childBridges.set(bridgeKey, childBridge);
+                this.childBridges.set(platformConfig._bridge.username, childBridge);
                 // add config to child bridge service
                 childBridge.addConfig(platformConfig);
-                // Matter for child bridges is handled inside the forked child process (childBridgeFork.ts)
-                // to maintain isolation - each child process manages its own Matter server
                 return;
             }
             const platform = new constructor(logger, platformConfig, this.api);
@@ -560,48 +554,21 @@ export class Server {
         });
         return promises;
     }
-    /**
-     * Generate a unique identifier for a child bridge
-     * - For HAP bridges: returns the uppercase MAC address
-     * - For Matter-only bridges: returns "matter-{plugin}-{identifier}"
-     */
-    getChildBridgeKey(type, identifier, pluginName, bridgeConfig) {
-        if (bridgeConfig.matterOnly) {
-            // Matter-only bridge: generate identifier from plugin and platform/accessory name
-            return `matter-${pluginName}-${identifier}`;
-        }
-        // HAP bridge: use MAC address (already validated and uppercased)
-        return bridgeConfig.username.toUpperCase();
-    }
     /**
      * Validate an external bridge config
      */
-    validateChildBridgeConfig(type, identifier, pluginName, bridgeConfig, bridgeKey) {
-        // Matter-only bridges don't require HAP fields
-        if (bridgeConfig.matterOnly) {
-            if (!bridgeConfig.matter) {
-                throw new Error(`Error loading the ${type} "${identifier}" requested in your config.json - `
-                    + 'Matter-only bridge must have a "matter" configuration block in _bridge.matter.');
-            }
-            // Check for duplicate Matter-only bridges
-            if (this.childBridges.has(bridgeKey)) {
-                throw new Error(`Error loading the ${type} "${identifier}" requested in your config.json - `
-                    + 'A Matter-only bridge with this plugin and platform/accessory combination already exists. Each Matter-only bridge must be unique.');
-            }
-            // Matter-only bridges don't need username/pin validation
-            return;
-        }
-        // HAP bridges (or HAP+Matter bridges) require username and pin
+    validateChildBridgeConfig(type, identifier, bridgeConfig) {
+        // All child bridges require username
         if (!bridgeConfig.username) {
             throw new Error(`Error loading the ${type} "${identifier}" requested in your config.json - `
-                + 'Missing required field "_bridge.username". Set "matterOnly": true if you want a Matter-only bridge.');
+                + 'Missing required field "_bridge.username".');
         }
         if (!validMacAddress(bridgeConfig.username)) {
             throw new Error(`Error loading the ${type} "${identifier}" requested in your config.json - `
                 + `not a valid username in _bridge.username: "${bridgeConfig.username}". Must be 6 pairs of colon-separated hexadecimal chars (A-F 0-9), like a MAC address.`);
         }
-        if (this.childBridges.has(bridgeKey)) {
-            const childBridge = this.childBridges.get(bridgeKey);
+        if (this.childBridges.has(bridgeConfig.username)) {
+            const childBridge = this.childBridges.get(bridgeConfig.username);
             if (type === "platform" /* PluginType.PLATFORM */) {
                 // only a single platform can exist on one child bridge
                 throw new Error(`Error loading the ${type} "${identifier}" requested in your config.json - `
@@ -613,8 +580,6 @@ export class Server {
                     + `Duplicate username found in _bridge.username: "${bridgeConfig.username}". You can only group accessories of the same type in a child bridge.`);
             }
         }
-        // Check that child bridge username doesn't conflict with main bridge
-        // Main bridge always has a username (validated in loadConfig)
         if (bridgeConfig.username === this.config.bridge.username.toUpperCase()) {
             throw new Error(`Error loading the ${type} "${identifier}" requested in your config.json - `
                 + `Username found in _bridge.username: "${bridgeConfig.username}" is the same as the main bridge. Each child bridge platform/accessory must have it's own unique username.`);
@@ -631,9 +596,7 @@ export class Server {
             // noinspection SuspiciousTypeOfGuard
             if (typeof username === 'string') {
                 const childBridge = this.childBridges.get(username.toUpperCase());
-                if (childBridge) {
-                    childBridge.restartChildBridge();
-                }
+                childBridge?.restartChildBridge();
             }
         });
         // handle stop child bridge event
@@ -641,9 +604,7 @@ export class Server {
             // noinspection SuspiciousTypeOfGuard
             if (typeof username === 'string') {
                 const childBridge = this.childBridges.get(username.toUpperCase());
-                if (childBridge) {
-                    childBridge.stopChildBridge();
-                }
+                childBridge?.stopChildBridge();
             }
         });
         // handle start child bridge event
@@ -651,176 +612,32 @@ export class Server {
             // noinspection SuspiciousTypeOfGuard
             if (typeof username === 'string') {
                 const childBridge = this.childBridges.get(username.toUpperCase());
-                if (childBridge) {
-                    childBridge.startChildBridge();
-                }
+                childBridge?.startChildBridge();
             }
         });
         this.ipcService.on("childBridgeMetadataRequest" /* IpcIncomingEvent.CHILD_BRIDGE_METADATA_REQUEST */, () => {
-            const childBridgeMetadata = Array.from(this.childBridges.values()).map(x => x.getMetadata());
-            this.ipcService.sendMessage("childBridgeMetadataResponse" /* IpcOutgoingEvent.CHILD_BRIDGE_METADATA_RESPONSE */, childBridgeMetadata);
-        });
-        // Matter bridge IPC handlers
-        // Main bridge Matter server runs in this process alongside HAP
-        // Child bridge Matter servers run in forked child processes (see childBridgeFork.ts)
-        this.ipcService.on("restartMatterBridge" /* IpcIncomingEvent.RESTART_MATTER_BRIDGE */, (matterBridgeId) => {
-            if (matterBridgeId === 'main-bridge') {
-                // Main Matter bridge runs in the main process, so restart the entire Homebridge instance
-                log.info('Restarting Homebridge (Matter bridge restart requested)...');
-                process.kill(process.pid, 'SIGTERM');
-            }
-            else {
-                // Handle child bridge using cache for efficient lookup
-                const childBridge = this.matterBridgeCache.get(matterBridgeId);
-                if (childBridge) {
-                    childBridge.restartChildBridge();
-                }
-                else {
-                    log.warn(`Child bridge ${matterBridgeId} not found for Matter restart`);
-                }
-            }
-        });
-        this.ipcService.on("stopMatterBridge" /* IpcIncomingEvent.STOP_MATTER_BRIDGE */, (matterBridgeId) => {
-            if (matterBridgeId === 'main-bridge') {
-                log.warn('Stop requested for main Matter bridge - this is not supported');
-                log.info('The main Matter bridge runs alongside the HAP bridge and cannot be stopped independently');
-            }
-            else {
-                // Handle child bridge using cache for efficient lookup
-                const childBridge = this.matterBridgeCache.get(matterBridgeId);
-                if (childBridge) {
-                    childBridge.stopChildBridge();
-                }
-                else {
-                    log.warn(`Child bridge ${matterBridgeId} not found for Matter stop`);
-                }
-            }
-        });
-        this.ipcService.on("startMatterBridge" /* IpcIncomingEvent.START_MATTER_BRIDGE */, (matterBridgeId) => {
-            if (matterBridgeId === 'main-bridge') {
-                log.warn('Start requested for main Matter bridge - this is not supported');
-                log.info('The main Matter bridge starts automatically with Homebridge');
-            }
-            else {
-                // Handle child bridge using cache for efficient lookup
-                const childBridge = this.matterBridgeCache.get(matterBridgeId);
-                if (childBridge) {
-                    childBridge.startChildBridge();
-                }
-                else {
-                    log.warn(`Child bridge ${matterBridgeId} not found for Matter start`);
-                }
-            }
-        });
-        this.ipcService.on("matterBridgeMetadataRequest" /* IpcIncomingEvent.MATTER_BRIDGE_METADATA_REQUEST */, () => {
-            const matterBridges = [];
-            // Add main bridge Matter metadata if enabled
-            if (this.matterServer && this.matterServer.isServerRunning()) {
-                const commissioningInfo = this.matterServer.getCommissioningInfo();
-                matterBridges.push({
-                    type: 'matter',
-                    status: 'ok',
-                    port: this.config.bridge.matter?.port || 5540,
-                    setupUri: commissioningInfo.qrCode,
-                    pin: commissioningInfo.manualPairingCode,
-                    serialNumber: commissioningInfo.serialNumber,
-                    name: this.config.bridge.name,
-                    plugin: 'main-bridge',
-                    identifier: 'main-bridge',
-                    deviceCount: this.matterServer.getAccessories().length,
-                    commissioned: commissioningInfo.commissioned,
-                    matterEnabled: true,
-                });
-            }
-            // Add child bridge Matter metadata
-            for (const childBridge of this.childBridges.values()) {
-                const matterInfo = childBridge.getCommissioningInfo();
-                const matterConfig = childBridge.getMatterConfig();
-                if (matterInfo && matterConfig) {
-                    const metadata = childBridge.getMetadata();
-                    // Use plugin-identifier format to match storage
-                    const childIdentifier = `${metadata.plugin}-${childBridge.identifier}`;
-                    // Populate cache for efficient lookups
-                    this.matterBridgeCache.set(childIdentifier, childBridge);
-                    matterBridges.push({
-                        type: 'matter',
-                        status: metadata.status === 'ok' ? 'ok' : 'pending',
-                        port: matterConfig.port,
-                        setupUri: matterInfo.qrCode,
-                        pin: matterInfo.manualPairingCode,
-                        serialNumber: matterInfo.serialNumber,
-                        name: matterConfig.name || metadata.name,
-                        plugin: metadata.plugin,
-                        identifier: childIdentifier,
-                        commissioned: matterInfo.commissioned,
-                        username: metadata.username,
-                        matterEnabled: true,
-                    });
-                }
-            }
-            this.ipcService.sendMessage("matterBridgeMetadataResponse" /* IpcOutgoingEvent.MATTER_BRIDGE_METADATA_RESPONSE */, matterBridges);
-        });
-        this.ipcService.on("matterAccessoriesRequest" /* IpcIncomingEvent.MATTER_ACCESSORIES_REQUEST */, () => {
-            // Return Matter accessories from all bridges
-            const allMatterAccessories = {
-                children: {},
-            };
-            // Add main bridge accessories
-            if (this.matterServer) {
-                allMatterAccessories.children['main-bridge'] = this.matterServer.getAccessories();
-            }
-            // Child bridge accessories are managed by child processes
-            this.ipcService.sendMessage("matterAccessoriesResponse" /* IpcOutgoingEvent.MATTER_ACCESSORIES_RESPONSE */, allMatterAccessories);
-        });
-        this.ipcService.on("matterCommissioningInfoRequest" /* IpcIncomingEvent.MATTER_COMMISSIONING_INFO_REQUEST */, (matterBridgeId) => {
-            let rawInfo = { commissioned: false };
-            // Handle main bridge
-            if (matterBridgeId === 'main-bridge') {
-                if (this.matterServer && this.matterServer.isServerRunning()) {
-                    rawInfo = this.matterServer.getCommissioningInfo();
-                }
-                else {
-                    log.debug(`[Matter] Server not available when commissioning info requested for: ${matterBridgeId}`);
-                }
-            }
-            else {
-                // Handle child bridge using plugin-identifier format (e.g., homebridge-virtual-accessories-VirtualAccessoriesForHomebridge)
-                // Use cache for efficient O(1) lookup
-                const childBridge = this.matterBridgeCache.get(matterBridgeId);
-                if (childBridge) {
-                    rawInfo = childBridge.getCommissioningInfo() || { commissioned: false };
-                }
-                else {
-                    log.debug(`[Matter] Child bridge ${matterBridgeId} not found when commissioning info requested`);
-                }
-            }
-            // Transform property names to match MatterCommissioningInfo interface
-            const commissioningInfo = {
-                commissioned: rawInfo.commissioned || false,
-                pin: rawInfo.manualPairingCode, // Map manualPairingCode -> pin
-                setupUri: rawInfo.qrCode, // Map qrCode -> setupUri
-                serialNumber: rawInfo.serialNumber,
-            };
-            this.ipcService.sendMessage("matterCommissioningInfoResponse" /* IpcOutgoingEvent.MATTER_COMMISSIONING_INFO_RESPONSE */, commissioningInfo);
+            this.ipcService.sendMessage("childBridgeMetadataResponse" /* IpcOutgoingEvent.CHILD_BRIDGE_METADATA_RESPONSE */, Array.from(this.childBridges.values()).map(x => x.getMetadata()));
         });
     }
     printSetupInfo(pin) {
-        log.info('Setup Payload:');
-        log.info(this.bridgeService.bridge.setupURI());
+        /* eslint-disable no-console */
+        console.log('Setup Payload:');
+        console.log(this.bridgeService.bridge.setupURI());
         if (!this.options.hideQRCode) {
-            log.info('Scan this code with your HomeKit app on your iOS device to pair with Homebridge:');
+            console.log('Scan this code with your HomeKit app on your iOS device to pair with Homebridge:');
             qrcode.setErrorLevel('M'); // HAP specifies level M or higher for ECC
             qrcode.generate(this.bridgeService.bridge.setupURI());
-            log.info('Or enter this code with your HomeKit app on your iOS device to pair with Homebridge:');
+            console.log('Or enter this code with your HomeKit app on your iOS device to pair with Homebridge:');
         }
         else {
-            log.info('Enter this code with your HomeKit app on your iOS device to pair with Homebridge:');
+            console.log('Enter this code with your HomeKit app on your iOS device to pair with Homebridge:');
         }
-        log.info(chalk.black.bgWhite('                       '));
-        log.info(chalk.black.bgWhite('    ┌────────────┐     '));
-        log.info(chalk.black.bgWhite(`    │ ${pin} │     `));
-        log.info(chalk.black.bgWhite('    └────────────┘     '));
-        log.info(chalk.black.bgWhite('                       '));
+        console.log(chalk.black.bgWhite('                       '));
+        console.log(chalk.black.bgWhite('    ┌────────────┐     '));
+        console.log(chalk.black.bgWhite(`    │ ${pin} │     `));
+        console.log(chalk.black.bgWhite('    └────────────┘     '));
+        console.log(chalk.black.bgWhite('                       '));
+        /* eslint-enable no-console */
     }
 }
 //# sourceMappingURL=server.js.map