homebridge 2.0.0-alpha.40 → 2.0.0-alpha.41

package/dist/matter/portAllocator.js.map

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

package/dist/server.d.ts

@@ -28,11 +28,12 @@ export declare class Server {
     private readonly api;
     private readonly pluginManager;
     private readonly bridgeService;
-    private readonly matterService;
     private readonly ipcService;
     private readonly externalPortService;
     private readonly config;
     private readonly childBridges;
+    private readonly childMatterBridges;
+    private readonly platformConfigs;
     private serverStatus;
     constructor(options?: HomebridgeOptions);
     /**
@@ -41,10 +42,15 @@ export declare class Server {
      */
     private setServerStatus;
     start(): Promise<void>;
+    /**
+     * Get the status of all Matter bridges (child bridges only)
+     */
+    getMatterBridgesStatus(): any[];
     teardown(): void;
     private publishBridge;
-    private handlePublishMatterAccessories;
-    private handleUnpublishMatterAccessories;
+    private handlePublishExternalAccessories;
+    private handleRegisterPlatformAccessories;
+    private handleUnregisterPlatformAccessories;
     private static loadConfig;
     private loadAccessories;
     private loadPlatforms;

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAqCA,MAAM,WAAW,iBAAiB;IAChC,6BAA6B,CAAC,EAAE,OAAO,CAAA;IACvC,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,sBAAsB,CAAC,EAAE,OAAO,CAAA;CACjC;AAGD,0BAAkB,YAAY;IAC5B;;OAEG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,EAAE,OAAO;IAET;;OAEG;IACH,IAAI,SAAS;CACd;AAED,qBAAa,MAAM;IAiBf,OAAO,CAAC,OAAO;IAhBjB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqB;IAEzD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IAGzC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAiD;IAG9E,OAAO,CAAC,YAAY,CAAqC;gBAG/C,OAAO,GAAE,iBAAsB;IAoEzC;;;OAGG;IACH,OAAO,CAAC,eAAe;IAYV,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC5B,QAAQ,IAAI,IAAI;IAQvB,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,8BAA8B;IAUtC,OAAO,CAAC,gCAAgC;IAUxC,OAAO,CAAC,MAAM,CAAC,UAAU;IAoFzB,OAAO,CAAC,eAAe;IAoGvB,OAAO,CAAC,aAAa;IA4FrB;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAiCjC;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAuClC,OAAO,CAAC,cAAc;CAqBvB"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAsCA,MAAM,WAAW,iBAAiB;IAChC,6BAA6B,CAAC,EAAE,OAAO,CAAA;IACvC,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,sBAAsB,CAAC,EAAE,OAAO,CAAA;CACjC;AAGD,0BAAkB,YAAY;IAC5B;;OAEG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,EAAE,OAAO;IAET;;OAEG;IACH,IAAI,SAAS;CACd;AAED,qBAAa,MAAM;IAoBf,OAAO,CAAC,OAAO;IAnBjB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqB;IAEzD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IAGzC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAiD;IAC9E,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAmD;IAGtF,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyC;IAGzE,OAAO,CAAC,YAAY,CAAqC;gBAG/C,OAAO,GAAE,iBAAsB;IAgEzC;;;OAGG;IACH,OAAO,CAAC,eAAe;IAyBV,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA+FnC;;OAEG;IACI,sBAAsB,IAAI,GAAG,EAAE;IAI/B,QAAQ,IAAI,IAAI;IAavB,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,gCAAgC;IAmHxC,OAAO,CAAC,iCAAiC;IAyBzC,OAAO,CAAC,mCAAmC;IAyB3C,OAAO,CAAC,MAAM,CAAC,UAAU;IAoFzB,OAAO,CAAC,eAAe;IAsJvB,OAAO,CAAC,aAAa;IAoJrB;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAiCjC;;OAEG;IACH,OAAO,CAAC,0BAA0B;IA4IlC,OAAO,CAAC,cAAc;CAqBvB"}

package/dist/server.js

@@ -5,10 +5,11 @@ import qrcode from 'qrcode-terminal';
 import { HomebridgeAPI } from './api.js';
 import { BridgeService } from './bridgeService.js';
 import { ChildBridgeService } from './childBridgeService.js';
+import { ChildMatterBridgeService } from './childMatterBridgeService.js';
 import { ExternalPortService } from './externalPortService.js';
 import { IpcService } from './ipcService.js';
 import { Logger } from './logger.js';
-import { MatterService } from './matterService.js';
+import { MatterConfigValidator } from './matter/matterConfigValidator.js';
 import { PluginManager } from './pluginManager.js';
 import { User } from './user.js';
 import { validMacAddress } from './util/mac.js';
@@ -34,12 +35,14 @@ export class Server {
     api;
     pluginManager;
     bridgeService;
-    matterService;
     ipcService;
     externalPortService;
     config;
     // used to keep track of child bridges
     childBridges = new Map();
+    childMatterBridges = new Map();
+    // Track platform configurations for routing accessories
+    platformConfigs = new Map();
     // current server status
     serverStatus = "pending" /* ServerStatus.PENDING */;
     constructor(options = {}) {
@@ -67,11 +70,12 @@ 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);
-        // create Matter service
-        this.matterService = new MatterService(this.config.matter || {}, this.pluginManager, this.externalPortService, this.api, this.options);
-        // Set up Matter event handlers
-        this.api.on("publishMatterAccessories" /* InternalAPIEvent.PUBLISH_MATTER_ACCESSORIES */, this.handlePublishMatterAccessories.bind(this));
-        this.api.on("unpublishMatterAccessories" /* InternalAPIEvent.UNPUBLISH_MATTER_ACCESSORIES */, this.handleUnpublishMatterAccessories.bind(this));
+        // Matter is handled via _matter configuration, not API events
+        // Intercept platform accessory registration to route to Matter bridges if needed
+        this.api.on("registerPlatformAccessories" /* InternalAPIEvent.REGISTER_PLATFORM_ACCESSORIES */, this.handleRegisterPlatformAccessories.bind(this));
+        this.api.on("unregisterPlatformAccessories" /* InternalAPIEvent.UNREGISTER_PLATFORM_ACCESSORIES */, this.handleUnregisterPlatformAccessories.bind(this));
+        // Handle external accessories (cameras, etc.) for Matter
+        this.api.on("publishExternalAccessories" /* InternalAPIEvent.PUBLISH_EXTERNAL_ACCESSORIES */, this.handlePublishExternalAccessories.bind(this));
         // watch bridge events to check when server is online
         this.bridgeService.bridge.on("advertised" /* AccessoryEventTypes.ADVERTISED */, () => {
             this.setServerStatus("ok" /* ServerStatus.OK */);
@@ -91,19 +95,37 @@ export class Server {
      */
     setServerStatus(status) {
         this.serverStatus = status;
+        // Collect child Matter bridge statuses
+        const childMatterBridgeStatuses = Array.from(this.childMatterBridges.values()).map(bridge => bridge.getMetadata());
+        // Get Matter bridges status (child bridges only)
+        const matterStatus = childMatterBridgeStatuses.length > 0
+            ? {
+                children: childMatterBridgeStatuses,
+            }
+            : undefined;
         this.ipcService.sendMessage("serverStatusUpdate" /* IpcOutgoingEvent.SERVER_STATUS_UPDATE */, {
+            type: 'hap', // Main bridge is HAP
             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,
             username: this.config.bridge.username,
             pin: this.config.bridge.pin,
+            matterStatus,
         });
     }
     async start() {
         if (this.config.bridge.disableIpc !== true) {
             this.initializeIpcEventHandlers();
         }
+        // Track existing Matter bridges before loading new configuration
+        const existingMatterBridgeIds = new Set(this.childMatterBridges.keys());
+        // Validate child Matter configurations
+        const matterValidation = MatterConfigValidator.validateAllChildMatterConfigs(this.config.platforms, this.config.accessories);
+        if (!matterValidation.isValid) {
+            log.error('Child Matter configuration validation failed. Please fix the errors above.');
+            // Continue anyway but child Matter bridges may not work properly
+        }
         const promises = [];
         // load the cached accessories
         await this.bridgeService.loadCachedPlatformAccessoriesFromDisk();
@@ -115,10 +137,52 @@ export class Server {
         if (this.config.accessories.length > 0) {
             this.loadAccessories();
         }
-        // start child bridges
+        // Track which Matter bridges are still in the configuration
+        const currentMatterBridgeIds = new Set();
+        // Check platforms for Matter bridges
+        this.config.platforms.forEach((platformConfig) => {
+            if (platformConfig._matter && platformConfig.platform) {
+                try {
+                    const plugin = this.pluginManager.getPluginForPlatform(platformConfig.platform);
+                    const matterIdentifier = `${plugin.getPluginIdentifier()}-${platformConfig.platform}`;
+                    currentMatterBridgeIds.add(matterIdentifier);
+                }
+                catch {
+                    // Plugin not found, skip
+                }
+            }
+        });
+        // Check accessories for Matter bridges
+        this.config.accessories.forEach((accessoryConfig) => {
+            if (accessoryConfig._matter && accessoryConfig.accessory) {
+                try {
+                    const plugin = this.pluginManager.getPluginForAccessory(accessoryConfig.accessory);
+                    const matterIdentifier = `${plugin.getPluginIdentifier()}-${accessoryConfig.accessory}`;
+                    currentMatterBridgeIds.add(matterIdentifier);
+                }
+                catch {
+                    // Plugin not found, skip
+                }
+            }
+        });
+        // Clean up Matter bridges that were removed from configuration
+        for (const bridgeId of existingMatterBridgeIds) {
+            if (!currentMatterBridgeIds.has(bridgeId) && this.childMatterBridges.has(bridgeId)) {
+                const removedBridge = this.childMatterBridges.get(bridgeId);
+                log.info(`Matter bridge "${bridgeId}" was removed from configuration, cleaning up...`);
+                // Stop and clean up the removed bridge (with permanent flag)
+                await removedBridge.teardown(true);
+                this.childMatterBridges.delete(bridgeId);
+            }
+        }
+        // start child HAP bridges
         for (const childBridge of this.childBridges.values()) {
             childBridge.start();
         }
+        // start child Matter bridges
+        for (const childMatterBridge of this.childMatterBridges.values()) {
+            promises.push(childMatterBridge.start());
+        }
         // restore cached accessories
         this.bridgeService.restoreCachedPlatformAccessories();
         this.api.signalFinished();
@@ -126,41 +190,159 @@ export class Server {
         await Promise.all(promises)
             .then(() => this.publishBridge());
     }
+    /**
+     * Get the status of all Matter bridges (child bridges only)
+     */
+    getMatterBridgesStatus() {
+        return Array.from(this.childMatterBridges.values()).map(bridge => bridge.getMetadata());
+    }
     teardown() {
         this.bridgeService.teardown();
-        this.matterService.stop().catch((error) => {
-            log.error('Failed to stop Matter service:', error);
-        });
+        // Stop all child Matter bridges
+        for (const childMatterBridge of this.childMatterBridges.values()) {
+            childMatterBridge.teardown().catch((error) => {
+                log.error(`Failed to stop child Matter bridge ${childMatterBridge.getDisplayName()}:`, error);
+            });
+        }
         this.setServerStatus("down" /* ServerStatus.DOWN */);
     }
     publishBridge() {
         this.bridgeService.publishBridge();
-        // Initialize and start Matter service if enabled
-        this.matterService.initialize().then(() => {
-            this.matterService.start().catch((error) => {
-                log.error('Failed to start Matter service:', error);
-            });
-        }).catch((error) => {
-            log.error('Failed to initialize Matter service:', error);
-        });
         this.printSetupInfo(this.config.bridge.pin);
     }
-    handlePublishMatterAccessories(accessories) {
-        log.info(`Publishing ${accessories.length} accessories via Matter protocol`);
+    // Matter accessories are managed via _matter configuration, not API methods
+    handlePublishExternalAccessories(accessories) {
+        log.info(`Publishing ${accessories.length} external accessories`);
+        // External accessories are only published to child Matter bridges, not main bridge
+        // Group accessories by plugin
+        const accessoriesByPlugin = new Map();
         accessories.forEach((accessory) => {
-            this.matterService.publishAccessory(accessory).catch((error) => {
-                log.error(`Failed to publish accessory "${accessory.displayName}" via Matter:`, error);
-            });
+            const pluginIdentifier = accessory._associatedPlugin;
+            if (!pluginIdentifier) {
+                log.warn(`External accessory "${accessory.displayName}" has no plugin identifier`);
+                return;
+            }
+            if (!accessoriesByPlugin.has(pluginIdentifier)) {
+                accessoriesByPlugin.set(pluginIdentifier, []);
+            }
+            accessoriesByPlugin.get(pluginIdentifier).push(accessory);
         });
-    }
-    handleUnpublishMatterAccessories(accessories) {
-        log.info(`Unpublishing ${accessories.length} accessories from Matter protocol`);
-        accessories.forEach((accessory) => {
-            this.matterService.unpublishAccessory(accessory).catch((error) => {
-                log.error(`Failed to unpublish accessory "${accessory.displayName}" from Matter:`, error);
-            });
+        // Process each plugin's external accessories
+        accessoriesByPlugin.forEach((pluginAccessories, pluginIdentifier) => {
+            // Check if there's already an external Matter bridge for this plugin
+            const externalMatterBridgeId = `${pluginIdentifier}-external`;
+            let externalMatterBridge = this.childMatterBridges.get(externalMatterBridgeId);
+            if (!externalMatterBridge) {
+                // Check if this plugin has any Matter-enabled platform config
+                let hasMatterConfig = false;
+                let baseMatterConfig = {};
+                // Look for any platform with Matter config from this plugin
+                for (const [bridgeId, childBridge] of this.childMatterBridges) {
+                    if (bridgeId.startsWith(`${pluginIdentifier}-`) && childBridge.type === "platform" /* PluginType.PLATFORM */) {
+                        hasMatterConfig = true;
+                        // Use existing Matter bridge configuration as template
+                        baseMatterConfig = {
+                        // Port will be auto-allocated
+                        };
+                        break;
+                    }
+                }
+                // If plugin has Matter-enabled platforms, create external bridge automatically
+                if (hasMatterConfig) {
+                    log.info(`Automatically creating external Matter bridge for ${pluginIdentifier}`);
+                    const plugin = this.pluginManager.getPlugin(pluginIdentifier);
+                    if (!plugin) {
+                        log.warn(`Could not find plugin ${pluginIdentifier} to create external Matter bridge`);
+                        return;
+                    }
+                    // Create synthetic config for external bridge
+                    const externalConfig = {
+                        platform: '__external__',
+                        name: `${pluginIdentifier} External`,
+                        _matter: {
+                            ...baseMatterConfig,
+                            name: `${pluginIdentifier} External Matter`,
+                        },
+                    };
+                    externalMatterBridge = new ChildMatterBridgeService("platform" /* PluginType.PLATFORM */, plugin, externalConfig._matter, externalConfig, this.api, this.externalPortService, this.options, this.ipcService, this.config);
+                    this.childMatterBridges.set(externalMatterBridgeId, externalMatterBridge);
+                    // Start the external bridge
+                    externalMatterBridge.start().catch((error) => {
+                        log.error(`Failed to start external Matter bridge for ${pluginIdentifier}:`, error);
+                    });
+                }
+            }
+            // Publish accessories to appropriate bridge
+            if (externalMatterBridge) {
+                pluginAccessories.forEach((accessory) => {
+                    externalMatterBridge.addAccessory(accessory);
+                    log.info(`External accessory "${accessory.displayName}" added to automatic external Matter bridge`);
+                });
+            }
+            else {
+                // Check if any child Matter bridge from this plugin can handle it
+                let publishedToChildBridge = false;
+                for (const [bridgeId, childBridge] of this.childMatterBridges) {
+                    if (bridgeId.startsWith(`${pluginIdentifier}-`)) {
+                        pluginAccessories.forEach((accessory) => {
+                            childBridge.addAccessory(accessory);
+                            log.info(`External accessory "${accessory.displayName}" added to plugin's Matter bridge`);
+                        });
+                        publishedToChildBridge = true;
+                        break;
+                    }
+                }
+                // External accessories are only published to child Matter bridges, not main bridge
+                if (!publishedToChildBridge) {
+                    pluginAccessories.forEach((accessory) => {
+                        log.debug(`External accessory "${accessory.displayName}" not published to Matter - configure _matter property for Matter support`);
+                    });
+                }
+            }
         });
     }
+    handleRegisterPlatformAccessories(accessories) {
+        // Route to HAP bridge (default behavior)
+        this.bridgeService.handleRegisterPlatformAccessories(accessories);
+        // Check if we need to also route to Matter bridges
+        for (const accessory of accessories) {
+            const platformKey = `${accessory._associatedPlugin}-${accessory._associatedPlatform}`;
+            const platformConfig = this.platformConfigs.get(platformKey);
+            if (platformConfig) {
+                // Check if platform has child Matter bridge
+                if (platformConfig._matter && typeof platformConfig._matter === 'object') {
+                    const matterIdentifier = `${accessory._associatedPlugin}-${accessory._associatedPlatform}`;
+                    const childMatterBridge = this.childMatterBridges.get(matterIdentifier);
+                    if (childMatterBridge) {
+                        childMatterBridge.addAccessory(accessory).catch((error) => {
+                            log.error(`Failed to add accessory "${accessory.displayName}" to child Matter bridge:`, error);
+                        });
+                    }
+                }
+            }
+        }
+    }
+    handleUnregisterPlatformAccessories(accessories) {
+        // Route to HAP bridge (default behavior)
+        this.bridgeService.handleUnregisterPlatformAccessories(accessories);
+        // Check if we need to also unregister from Matter bridges
+        for (const accessory of accessories) {
+            const platformKey = `${accessory._associatedPlugin}-${accessory._associatedPlatform}`;
+            const platformConfig = this.platformConfigs.get(platformKey);
+            if (platformConfig) {
+                // Check if platform has child Matter bridge
+                if (platformConfig._matter && typeof platformConfig._matter === 'object') {
+                    const matterIdentifier = `${accessory._associatedPlugin}-${accessory._associatedPlatform}`;
+                    const childMatterBridge = this.childMatterBridges.get(matterIdentifier);
+                    if (childMatterBridge) {
+                        childMatterBridge.removeAccessory(accessory).catch((error) => {
+                            log.error(`Failed to remove accessory "${accessory.displayName}" from child Matter bridge:`, error);
+                        });
+                    }
+                }
+            }
+        }
+    }
     static loadConfig() {
         // Look for the configuration file
         const configPath = User.configPath();
@@ -295,6 +477,40 @@ export class Server {
                 }
                 // add config to child bridge service
                 childBridge.addConfig(accessoryConfig);
+                // If _matter is not defined, we're done - this accessory only uses HAP child bridge
+                if (!accessoryConfig._matter) {
+                    return;
+                }
+            }
+            // Handle child Matter bridge for accessories
+            if (accessoryConfig._matter && typeof accessoryConfig._matter === 'object') {
+                const matterIdentifier = `${plugin.getPluginIdentifier()}-${accessoryIdentifier}`;
+                logger(`Initializing child Matter bridge for accessory ${accessoryIdentifier}`);
+                // Ensure Matter config has proper name
+                // Try to get a human-friendly name from the accessory
+                // Convert CamelCase accessory identifier to spaces
+                const formattedAccessoryId = accessoryIdentifier.replace(/([A-Z])/g, ' $1').trim();
+                // Get plugin name without 'homebridge-' prefix and replace dashes with spaces
+                const pluginDisplayName = plugin.getPluginIdentifier()
+                    .replace('homebridge-', '')
+                    .replace(/-/g, ' ')
+                    .split(' ')
+                    .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+                    .join(' ');
+                const defaultName = accessoryConfig.name || formattedAccessoryId || pluginDisplayName;
+                const matterConfig = {
+                    ...accessoryConfig._matter,
+                    name: accessoryConfig._matter.name || defaultName,
+                };
+                const childMatterBridge = new ChildMatterBridgeService("accessory" /* PluginType.ACCESSORY */, plugin, matterConfig, accessoryConfig, this.api, this.externalPortService, this.options, this.ipcService);
+                this.childMatterBridges.set(matterIdentifier, childMatterBridge);
+                // If _bridge is also defined, we're done - accessory uses both protocols
+                if (accessoryConfig._bridge) {
+                    return;
+                }
+            }
+            // If both _bridge and _matter are defined, the accessory is handled by child bridges
+            if (accessoryConfig._bridge || accessoryConfig._matter) {
                 return;
             }
             const accessoryInstance = new constructor(logger, accessoryConfig, this.api);
@@ -352,6 +568,10 @@ export class Server {
             }
             const logger = Logger.withPrefix(displayName);
             logger('Initializing %s platform...', platformIdentifier);
+            // Store platform config for later routing
+            const platformKey = `${plugin.getPluginIdentifier()}-${platformIdentifier}`;
+            this.platformConfigs.set(platformKey, platformConfig);
+            // Handle child HAP bridge
             if (platformConfig._bridge) {
                 // ensure the username is always uppercase
                 platformConfig._bridge.username = platformConfig._bridge.username.toUpperCase();
@@ -367,6 +587,40 @@ export class Server {
                 this.childBridges.set(platformConfig._bridge.username, childBridge);
                 // add config to child bridge service
                 childBridge.addConfig(platformConfig);
+                // If _matter is not defined, we're done - this platform only uses HAP child bridge
+                if (!platformConfig._matter) {
+                    return;
+                }
+            }
+            // Handle child Matter bridge
+            if (platformConfig._matter && typeof platformConfig._matter === 'object') {
+                const matterIdentifier = `${plugin.getPluginIdentifier()}-${platformIdentifier}`;
+                logger(`Initializing child Matter bridge for ${platformIdentifier}`);
+                // Ensure Matter config has proper name
+                // Try to get a human-friendly name from the platform
+                // Convert CamelCase platform identifier to spaces (e.g., "Ring" stays "Ring", "MySmartHome" becomes "My Smart Home")
+                const formattedPlatformId = platformIdentifier.replace(/([A-Z])/g, ' $1').trim();
+                // Get plugin name without 'homebridge-' prefix and replace dashes with spaces
+                const pluginDisplayName = plugin.getPluginIdentifier()
+                    .replace('homebridge-', '')
+                    .replace(/-/g, ' ')
+                    .split(' ')
+                    .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+                    .join(' ');
+                const defaultName = platformConfig.name || formattedPlatformId || pluginDisplayName;
+                const matterConfig = {
+                    ...platformConfig._matter,
+                    name: platformConfig._matter.name || defaultName,
+                };
+                const childMatterBridge = new ChildMatterBridgeService("platform" /* PluginType.PLATFORM */, plugin, matterConfig, platformConfig, this.api, this.externalPortService, this.options, this.ipcService);
+                this.childMatterBridges.set(matterIdentifier, childMatterBridge);
+                // If _bridge is also defined, we're done - platform uses both protocols
+                if (platformConfig._bridge) {
+                    return;
+                }
+            }
+            // If both _bridge and _matter are defined, the platform is handled by child bridges
+            if (platformConfig._bridge || platformConfig._matter) {
                 return;
             }
             const platform = new constructor(logger, platformConfig, this.api);
@@ -442,6 +696,84 @@ export class Server {
         this.ipcService.on("childBridgeMetadataRequest" /* IpcIncomingEvent.CHILD_BRIDGE_METADATA_REQUEST */, () => {
             this.ipcService.sendMessage("childBridgeMetadataResponse" /* IpcOutgoingEvent.CHILD_BRIDGE_METADATA_RESPONSE */, Array.from(this.childBridges.values()).map(x => x.getMetadata()));
         });
+        // Matter bridge IPC handlers
+        this.ipcService.on("restartMatterBridge" /* IpcIncomingEvent.RESTART_MATTER_BRIDGE */, (matterBridgeId) => {
+            log.info(`Received restart request for Matter bridge: ${matterBridgeId}`);
+            if (typeof matterBridgeId === 'string') {
+                const matterBridge = this.childMatterBridges.get(matterBridgeId);
+                if (matterBridge) {
+                    log.info(`Restarting Matter bridge: ${matterBridgeId}`);
+                    matterBridge.restartChildBridge();
+                }
+                else {
+                    log.warn(`Matter bridge not found: ${matterBridgeId}`);
+                    log.debug('Available Matter bridges:', Array.from(this.childMatterBridges.keys()));
+                }
+            }
+        });
+        this.ipcService.on("stopMatterBridge" /* IpcIncomingEvent.STOP_MATTER_BRIDGE */, (matterBridgeId) => {
+            log.info(`Received stop request for Matter bridge: ${matterBridgeId}`);
+            if (typeof matterBridgeId === 'string') {
+                const matterBridge = this.childMatterBridges.get(matterBridgeId);
+                if (matterBridge) {
+                    log.info(`Stopping Matter bridge: ${matterBridgeId}`);
+                    matterBridge.stopChildBridge();
+                }
+                else {
+                    log.warn(`Matter bridge not found: ${matterBridgeId}`);
+                }
+            }
+        });
+        this.ipcService.on("startMatterBridge" /* IpcIncomingEvent.START_MATTER_BRIDGE */, (matterBridgeId) => {
+            log.info(`Received start request for Matter bridge: ${matterBridgeId}`);
+            if (typeof matterBridgeId === 'string') {
+                const matterBridge = this.childMatterBridges.get(matterBridgeId);
+                if (matterBridge) {
+                    log.info(`Starting Matter bridge: ${matterBridgeId}`);
+                    matterBridge.startChildBridge();
+                }
+                else {
+                    log.warn(`Matter bridge not found: ${matterBridgeId}`);
+                }
+            }
+        });
+        this.ipcService.on("matterBridgeMetadataRequest" /* IpcIncomingEvent.MATTER_BRIDGE_METADATA_REQUEST */, () => {
+            // Return all child Matter bridge metadata
+            this.ipcService.sendMessage("matterBridgeMetadataResponse" /* IpcOutgoingEvent.MATTER_BRIDGE_METADATA_RESPONSE */, Array.from(this.childMatterBridges.values()).map(x => x.getMetadata()));
+        });
+        this.ipcService.on("matterAccessoriesRequest" /* IpcIncomingEvent.MATTER_ACCESSORIES_REQUEST */, () => {
+            // Collect Matter accessories from all child bridges
+            const allMatterAccessories = {
+                children: {},
+            };
+            // Add child bridge accessories
+            for (const [bridgeId, childBridge] of this.childMatterBridges) {
+                allMatterAccessories.children[bridgeId] = childBridge.getMatterAccessories ? childBridge.getMatterAccessories() : [];
+            }
+            this.ipcService.sendMessage("matterAccessoriesResponse" /* IpcOutgoingEvent.MATTER_ACCESSORIES_RESPONSE */, allMatterAccessories);
+        });
+        // Handle new Matter IPC events
+        this.ipcService.on("toggleMatterDevice" /* IpcIncomingEvent.TOGGLE_MATTER_DEVICE */, (data) => {
+            if (data && data.uuid) {
+                // This would toggle Matter for a specific device
+                // Implementation depends on how devices are managed
+                log.debug(`Toggle Matter for device ${data.uuid}: ${data.enabled}`);
+                // Send status update
+                this.ipcService.sendMessage("matterDeviceStatusUpdate" /* IpcOutgoingEvent.MATTER_DEVICE_STATUS_UPDATE */, {
+                    uuid: data.uuid,
+                    matterEnabled: data.enabled,
+                });
+            }
+        });
+        this.ipcService.on("matterCommissioningInfoRequest" /* IpcIncomingEvent.MATTER_COMMISSIONING_INFO_REQUEST */, (matterBridgeId) => {
+            let commissioningInfo = null;
+            // Get child bridge commissioning info
+            const childBridge = this.childMatterBridges.get(matterBridgeId);
+            if (childBridge && childBridge.getCommissioningInfo) {
+                commissioningInfo = childBridge.getCommissioningInfo();
+            }
+            this.ipcService.sendMessage("matterCommissioningInfoResponse" /* IpcOutgoingEvent.MATTER_COMMISSIONING_INFO_RESPONSE */, commissioningInfo || { commissioned: false });
+        });
     }
     printSetupInfo(pin) {
         /* eslint-disable no-console */