homebridge 2.0.0-alpha.7 → 2.0.0-alpha.70

package/dist/server.d.ts

@@ -32,6 +32,8 @@ export declare class Server {
     private readonly externalPortService;
     private readonly config;
     private readonly childBridges;
+    private matterServer?;
+    private readonly externalMatterServers;
     private serverStatus;
     constructor(options?: HomebridgeOptions);
     /**
@@ -40,8 +42,28 @@ export declare class Server {
      */
     private setServerStatus;
     start(): Promise<void>;
-    teardown(): void;
+    /**
+     * Initialize Matter server for main bridge if enabled
+     */
+    private initializeMatterServer;
+    teardown(): Promise<void>;
     private publishBridge;
+    private handlePublishExternalAccessories;
+    /**
+     * 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.
+     */
+    private handlePublishExternalMatterAccessories;
+    private handleRegisterPlatformAccessories;
+    private handleUnregisterPlatformAccessories;
+    private handleRegisterMatterPlatformAccessories;
+    private handleUnregisterMatterPlatformAccessories;
+    private handleUpdateMatterAccessoryState;
+    /**
+     * Restore cached Matter accessories (matching HAP pattern)
+     */
+    private restoreCachedMatterAccessories;
     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":"AAmCA,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;IAgBf,OAAO,CAAC,OAAO;IAfjB,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;IAG9E,OAAO,CAAC,YAAY,CAAqC;gBAG/C,OAAO,GAAE,iBAAsB;IAuDzC;;;OAGG;IACH,OAAO,CAAC,eAAe;IAYV,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC5B,QAAQ,IAAI,IAAI;IAKvB,OAAO,CAAC,aAAa;IAKrB,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;IAoClC,OAAO,CAAC,cAAc;CAqBvB"}
+{"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;IAwBf,OAAO,CAAC,OAAO;IAvBjB,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;IAIzC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA6C;IAG1E,OAAO,CAAC,YAAY,CAAC,CAAc;IAInC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAuC;IAG7E,OAAO,CAAC,YAAY,CAAqC;gBAG/C,OAAO,GAAE,iBAAsB;IAmEzC;;;OAGG;IACH,OAAO,CAAC,eAAe;IAsCV,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAuCnC;;OAEG;YACW,sBAAsB;IA8FvB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BtC,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,gCAAgC;IAMxC;;;;OAIG;YACW,sCAAsC;IA6EpD,OAAO,CAAC,iCAAiC;IAKzC,OAAO,CAAC,mCAAmC;IAK3C,OAAO,CAAC,uCAAuC;IAU/C,OAAO,CAAC,yCAAyC;IAUjD,OAAO,CAAC,gCAAgC;IAUxC;;OAEG;IACH,OAAO,CAAC,8BAA8B;IA8CtC,OAAO,CAAC,MAAM,CAAC,UAAU;IAiJzB,OAAO,CAAC,eAAe;IAoGvB,OAAO,CAAC,aAAa;IA4FrB;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAyCjC;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAuClC,OAAO,CAAC,cAAc;CAqBvB"}

package/dist/server.js

@@ -1,4 +1,4 @@
-import fs from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
 import process from 'node:process';
 import chalk from 'chalk';
 import qrcode from 'qrcode-terminal';
@@ -8,9 +8,10 @@ import { ChildBridgeService } from './childBridgeService.js';
 import { ExternalPortService } from './externalPortService.js';
 import { IpcService } from './ipcService.js';
 import { Logger } from './logger.js';
+import { MatterConfigValidator, MatterServer } from './matter/index.js';
 import { PluginManager } from './pluginManager.js';
 import { User } from './user.js';
-import { validMacAddress } from './util/mac.js';
+import { generate, validMacAddress } from './util/mac.js';
 const log = Logger.internal;
 // eslint-disable-next-line no-restricted-syntax
 export var ServerStatus;
@@ -37,7 +38,13 @@ export class Server {
     externalPortService;
     config;
     // used to keep track of child bridges
+    // Key is HAP username (MAC address)
     childBridges = new Map();
+    // Matter server instance for main 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();
     // current server status
     serverStatus = "pending" /* ServerStatus.PENDING */;
     constructor(options = {}) {
@@ -46,7 +53,7 @@ export class Server {
         // object we feed to Plugins and BridgeService
         this.api = new HomebridgeAPI();
         this.ipcService = new IpcService();
-        this.externalPortService = new ExternalPortService(this.config.ports);
+        this.externalPortService = new ExternalPortService(this.config.ports, this.config.matterPorts);
         // set status to pending
         this.setServerStatus("pending" /* ServerStatus.PENDING */);
         // create new plugin manager
@@ -64,7 +71,17 @@ 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));
+        // Handle external accessories (cameras, etc.)
+        this.api.on("publishExternalAccessories" /* InternalAPIEvent.PUBLISH_EXTERNAL_ACCESSORIES */, this.handlePublishExternalAccessories.bind(this));
+        // Handle Matter accessory registration (matching HAP pattern)
+        this.api.on("publishExternalMatterAccessories" /* InternalAPIEvent.PUBLISH_EXTERNAL_MATTER_ACCESSORIES */, this.handlePublishExternalMatterAccessories.bind(this));
+        this.api.on("registerMatterPlatformAccessories" /* InternalAPIEvent.REGISTER_MATTER_PLATFORM_ACCESSORIES */, this.handleRegisterMatterPlatformAccessories.bind(this));
+        this.api.on("unregisterMatterPlatformAccessories" /* InternalAPIEvent.UNREGISTER_MATTER_PLATFORM_ACCESSORIES */, this.handleUnregisterMatterPlatformAccessories.bind(this));
+        this.api.on("updateMatterAccessoryState" /* InternalAPIEvent.UPDATE_MATTER_ACCESSORY_STATE */, this.handleUpdateMatterAccessoryState.bind(this));
         // watch bridge events to check when server is online
         this.bridgeService.bridge.on("advertised" /* AccessoryEventTypes.ADVERTISED */, () => {
             this.setServerStatus("ok" /* ServerStatus.OK */);
@@ -84,14 +101,38 @@ export class Server {
      */
     setServerStatus(status) {
         this.serverStatus = status;
-        this.ipcService.sendMessage("serverStatusUpdate" /* IpcOutgoingEvent.SERVER_STATUS_UPDATE */, {
+        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) {
@@ -102,6 +143,8 @@ export class Server {
         await this.bridgeService.loadCachedPlatformAccessoriesFromDisk();
         // initialize plugins
         await this.pluginManager.initializeInstalledPlugins();
+        // Initialize Matter server for main bridge if enabled
+        await this.initializeMatterServer();
         if (this.config.platforms.length > 0) {
             promises.push(...this.loadPlatforms());
         }
@@ -114,19 +157,282 @@ export class Server {
         }
         // restore cached accessories
         this.bridgeService.restoreCachedPlatformAccessories();
+        this.restoreCachedMatterAccessories();
         this.api.signalFinished();
         // wait for all platforms to publish their accessories before we publish the bridge
         await Promise.all(promises)
             .then(() => this.publishBridge());
     }
-    teardown() {
+    /**
+     * Initialize Matter server for main bridge if enabled
+     */
+    async initializeMatterServer() {
+        // Check if main bridge has matter configuration
+        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
+            matterPort = this.config.bridge.matter.port;
+            if (!matterPort) {
+                matterPort = await this.externalPortService.requestPort(`${this.config.bridge.username}:MATTER`);
+                if (!matterPort) {
+                    matterPort = 5540; // Default Matter port
+                    log.warn('No port available from pool for main Matter bridge, using default port 5540');
+                }
+                else {
+                    log.info(`Allocated port ${matterPort} from pool for main Matter bridge`);
+                }
+            }
+            // Create Matter server instance with config inheritance from main bridge
+            const serialNumber = this.config.bridge.username.replace(/:/g, '');
+            this.matterServer = new MatterServer({
+                storagePath: User.matterPath(),
+                port: matterPort,
+                uniqueId: serialNumber,
+                manufacturer: this.config.bridge.manufacturer,
+                model: this.config.bridge.model,
+                firmwareRevision: this.config.bridge.firmwareRevision,
+                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);
+            // Set the Matter server reference for API methods like getAccessoryState
+            this.api._setMatterServer(this.matterServer);
+            // 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}`);
+                this.setServerStatus(this.serverStatus);
+            });
+        }
+        catch (error) {
+            log.error('Failed to initialize Matter server for main bridge:', error);
+            // Provide user-friendly guidance for common errors
+            if (error.message && error.message.includes('corrupted')) {
+                log.error('');
+                log.error('╔════════════════════════════════════════════════════════════════════════════╗');
+                log.error('║  MATTER STORAGE CORRUPTED                                                  ║');
+                log.error('╠════════════════════════════════════════════════════════════════════════════╣');
+                log.error('║  Your Matter storage has become corrupted. This can happen when:          ║');
+                log.error('║  • Matter.js library version changes                                       ║');
+                log.error('║  • Storage format upgrades occur                                           ║');
+                log.error('║  • Incomplete writes during shutdown                                       ║');
+                log.error('║                                                                            ║');
+                log.error('║  To fix this, delete the corrupted storage directory:                     ║');
+                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('');
+            }
+        }
+    }
+    async teardown() {
         this.bridgeService.teardown();
+        // Stop main Matter server if running
+        if (this.matterServer) {
+            try {
+                await this.matterServer.stop();
+            }
+            catch (error) {
+                log.error('Failed to stop Matter server:', error);
+            }
+        }
+        // Stop all external Matter servers
+        for (const [uuid, matterServer] of this.externalMatterServers) {
+            try {
+                await matterServer.stop();
+                log.debug(`Stopped external Matter server for ${uuid}`);
+            }
+            catch (error) {
+                log.error(`Failed to stop external Matter server for ${uuid}:`, error);
+            }
+        }
+        this.externalMatterServers.clear();
+        // Child bridge Matter servers are stopped by their own forked processes
         this.setServerStatus("down" /* ServerStatus.DOWN */);
     }
     publishBridge() {
         this.bridgeService.publishBridge();
         this.printSetupInfo(this.config.bridge.pin);
     }
+    handlePublishExternalAccessories(accessories) {
+        log.info(`Publishing ${accessories.length} external accessories`);
+        // External accessories are published via HAP
+        // Plugins should use api.matter to register Matter accessories explicitly
+    }
+    /**
+     * 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 handlePublishExternalMatterAccessories(accessories) {
+        log.info(`Publishing ${accessories.length} external Matter accessor${accessories.length === 1 ? 'y' : 'ies'}`);
+        for (const accessory of accessories) {
+            try {
+                // Validate accessory has required fields
+                if (!accessory.uuid) {
+                    log.error('External Matter accessory missing UUID - skipping');
+                    continue;
+                }
+                if (!accessory.displayName) {
+                    log.error(`External Matter accessory ${accessory.uuid} missing displayName - skipping`);
+                    continue;
+                }
+                // Check if already published
+                if (this.externalMatterServers.has(accessory.uuid)) {
+                    log.warn(`External Matter accessory ${accessory.displayName} (${accessory.uuid}) is already published`);
+                    continue;
+                }
+                // 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 this.externalPortService.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)');
+                    continue;
+                }
+                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: this.options.debugModeEnabled,
+                });
+                // Start the Matter server
+                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]);
+                // Store the server instance
+                this.externalMatterServers.set(accessory.uuid, matterServer);
+                log.info(`✓ External Matter accessory published: ${accessory.displayName} on port ${port}`);
+                // Log commissioning info
+                const commissioningInfo = matterServer.getCommissioningInfo();
+                if (commissioningInfo.qrCode && commissioningInfo.manualPairingCode) {
+                    log.info(`📱 Commissioning codes for ${accessory.displayName}:`);
+                    log.info(`   QR Code: ${commissioningInfo.qrCode}`);
+                    log.info(`   Manual Code: ${commissioningInfo.manualPairingCode}`);
+                }
+            }
+            catch (error) {
+                log.error(`Failed to publish external Matter accessory ${accessory.displayName}:`, error);
+            }
+        }
+    }
+    handleRegisterPlatformAccessories(accessories) {
+        // Route to HAP bridge
+        this.bridgeService.handleRegisterPlatformAccessories(accessories);
+    }
+    handleUnregisterPlatformAccessories(accessories) {
+        // Route to HAP bridge
+        this.bridgeService.handleUnregisterPlatformAccessories(accessories);
+    }
+    handleRegisterMatterPlatformAccessories(pluginIdentifier, platformName, accessories) {
+        if (!this.matterServer) {
+            log.warn('Cannot register Matter accessories - Matter server is not running');
+            return;
+        }
+        this.matterServer.registerPlatformAccessories(pluginIdentifier, platformName, accessories).catch((error) => {
+            log.error(`Failed to register Matter accessories for ${pluginIdentifier}:`, error);
+        });
+    }
+    handleUnregisterMatterPlatformAccessories(pluginIdentifier, platformName, accessories) {
+        if (!this.matterServer) {
+            log.warn('Cannot unregister Matter accessories - Matter server is not running');
+            return;
+        }
+        this.matterServer.unregisterPlatformAccessories(pluginIdentifier, platformName, accessories).catch((error) => {
+            log.error(`Failed to unregister Matter accessories for ${pluginIdentifier}:`, error);
+        });
+    }
+    handleUpdateMatterAccessoryState(uuid, cluster, attributes) {
+        if (!this.matterServer) {
+            log.warn('Cannot update Matter accessory state - Matter server is not running');
+            return;
+        }
+        this.matterServer.updateAccessoryState(uuid, cluster, attributes).catch((error) => {
+            log.error(`Failed to update Matter accessory state for ${uuid}:`, error);
+        });
+    }
+    /**
+     * Restore cached Matter accessories (matching HAP pattern)
+     */
+    restoreCachedMatterAccessories() {
+        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) {
+                    log.warn(`Could not find the associated plugin for the Matter accessory '${cachedAccessory.displayName}'. `
+                        + `Tried to find the plugin by the platform name but ${error.message}`);
+                }
+            }
+            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})`);
+                // Note: Matter accessories are not added to the bridge here - they're registered via plugin's didFinishLaunching
+                // The plugin can check if this accessory still exists and re-register or remove it
+            }
+            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`);
+                }
+            }
+        }
+    }
     static loadConfig() {
         // Look for the configuration file
         const configPath = User.configPath();
@@ -135,7 +441,7 @@ export class Server {
             username: 'CC:22:3D:E3:CE:30',
             pin: '031-45-154',
         };
-        if (!fs.existsSync(configPath)) {
+        if (!existsSync(configPath)) {
             log.warn('config.json (%s) not found.', configPath);
             return {
                 bridge: defaultBridge,
@@ -145,7 +451,7 @@ export class Server {
         }
         let config;
         try {
-            config = JSON.parse(fs.readFileSync(configPath, { encoding: 'utf8' }));
+            config = JSON.parse(readFileSync(configPath, { encoding: 'utf8' }));
         }
         catch (error) {
             log.error('There was a problem reading your config.json file.');
@@ -165,6 +471,18 @@ export class Server {
                 config.ports = undefined;
             }
         }
+        if (config.matterPorts !== undefined) {
+            if (config.matterPorts.start && config.matterPorts.end) {
+                if (config.matterPorts.start > config.matterPorts.end) {
+                    log.error('Invalid Matter port pool configuration. End should be greater than or equal to start.');
+                    config.matterPorts = undefined;
+                }
+            }
+            else {
+                log.error('Invalid configuration for \'matterPorts\'. Missing \'start\' and \'end\' properties! Ignoring it!');
+                config.matterPorts = undefined;
+            }
+        }
         const bridge = config.bridge || defaultBridge;
         bridge.name = bridge.name || defaultBridge.name;
         bridge.username = bridge.username || defaultBridge.username;
@@ -185,6 +503,44 @@ export class Server {
             config.platforms = [];
         }
         log.info('Loaded config.json with %s accessories and %s platforms.', config.accessories.length, config.platforms.length);
+        // Validate Matter configuration for port conflicts
+        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) {
+                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.');
+                    delete config.bridge.matter;
+                }
+            }
+            // Validate all child bridge Matter configs and check for port conflicts
+            const childMatterValidation = MatterConfigValidator.validateAllChildMatterConfigs(config.platforms, config.accessories);
+            if (!childMatterValidation.isValid) {
+                log.error('Some child bridge Matter configurations are invalid. Check the errors above.');
+            }
+            // Additionally, check for conflicts between main bridge Matter port and child bridge ports
+            if (config.bridge.matter?.port) {
+                const mainMatterPort = config.bridge.matter.port;
+                const childMatterPorts = [];
+                for (const platform of config.platforms) {
+                    if (platform._bridge?.matter?.port) {
+                        childMatterPorts.push(platform._bridge.matter.port);
+                    }
+                }
+                for (const accessory of config.accessories) {
+                    if (accessory._bridge?.matter?.port) {
+                        childMatterPorts.push(accessory._bridge.matter.port);
+                    }
+                }
+                if (childMatterPorts.includes(mainMatterPort)) {
+                    log.error(`Main bridge Matter port ${mainMatterPort} conflicts with a child bridge Matter port. Please use unique ports.`);
+                }
+                // Check for conflict with main bridge HAP port
+                if (config.bridge.port && Math.abs(config.bridge.port - mainMatterPort) < 10) {
+                    log.warn(`Main bridge HAP port ${config.bridge.port} and Matter port ${mainMatterPort} are very close. Consider spacing them further apart.`);
+                }
+            }
+        }
         if (config.bridge.advertiser) {
             if (![
                 "bonjour-hap" /* MDNSAdvertiser.BONJOUR */,
@@ -353,6 +709,11 @@ export class Server {
      * Validate an external bridge config
      */
     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".');
+        }
         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.`);
@@ -383,6 +744,7 @@ export class Server {
         this.ipcService.start();
         // handle restart child bridge event
         this.ipcService.on("restartChildBridge" /* IpcIncomingEvent.RESTART_CHILD_BRIDGE */, (username) => {
+            // noinspection SuspiciousTypeOfGuard
             if (typeof username === 'string') {
                 const childBridge = this.childBridges.get(username.toUpperCase());
                 childBridge?.restartChildBridge();
@@ -390,6 +752,7 @@ export class Server {
         });
         // handle stop child bridge event
         this.ipcService.on("stopChildBridge" /* IpcIncomingEvent.STOP_CHILD_BRIDGE */, (username) => {
+            // noinspection SuspiciousTypeOfGuard
             if (typeof username === 'string') {
                 const childBridge = this.childBridges.get(username.toUpperCase());
                 childBridge?.stopChildBridge();
@@ -397,6 +760,7 @@ export class Server {
         });
         // handle start child bridge event
         this.ipcService.on("startChildBridge" /* IpcIncomingEvent.START_CHILD_BRIDGE */, (username) => {
+            // noinspection SuspiciousTypeOfGuard
             if (typeof username === 'string') {
                 const childBridge = this.childBridges.get(username.toUpperCase());
                 childBridge?.startChildBridge();